Commit 64d9f7d8 authored by Chris Cantwell's avatar Chris Cantwell

Switched to gsmpi-1.1

Added XXT support from gsmpi-1.1
parent 8fd0607f
......@@ -275,6 +275,7 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake
${CMAKE_SOURCE_DIR}/cmake/NektarCommon.cmake
${CMAKE_SOURCE_DIR}/cmake/FindTinyXml.cmake
${CMAKE_SOURCE_DIR}/cmake/FindGSMPI.cmake
${CMAKE_SOURCE_DIR}/cmake/FindXXT.cmake
DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(EXPORT Nektar++Libraries DESTINATION ${LIB_DIR})
......
SET(GSMPI_SEARCH_PATHS
${CMAKE_SOURCE_DIR}/ThirdParty/gsmpi-1.0/
${CMAKE_SOURCE_DIR}/ThirdParty/gsmpi-1.0/build/
${CMAKE_SOURCE_DIR}/../ThirdParty/gsmpi-1.0/
${CMAKE_SOURCE_DIR}/../ThirdParty/gsmpi-1.0/build
${CMAKE_SOURCE_DIR}/ThirdParty/gsmpi-1.1/
${CMAKE_SOURCE_DIR}/ThirdParty/gsmpi-1.1/build/
${CMAKE_SOURCE_DIR}/../ThirdParty/gsmpi-1.1/
${CMAKE_SOURCE_DIR}/../ThirdParty/gsmpi-1.1/build
${CMAKE_SOURCE_DIR}/ThirdParty/dist/lib
${CMAKE_SOURCE_DIR}/../ThirdParty/dist/lib)
FIND_LIBRARY(GSMPI_LIBRARY NAMES gsmpi PATHS ${GSMPI_SEARCH_PATHS})
SET(GSMPI_FOUND FALSE)
IF (GSMPI_LIBRARY)
SET(GSMPI_FOUND TRUE)
......
SET(XXT_SEARCH_PATHS
${CMAKE_SOURCE_DIR}/ThirdParty/gsmpi-1.1/
${CMAKE_SOURCE_DIR}/ThirdParty/gsmpi-1.1/build/
${CMAKE_SOURCE_DIR}/../ThirdParty/gsmpi-1.1/
${CMAKE_SOURCE_DIR}/../ThirdParty/gsmpi-1.1/build
${CMAKE_SOURCE_DIR}/ThirdParty/dist/lib
${CMAKE_SOURCE_DIR}/../ThirdParty/dist/lib)
FIND_LIBRARY(XXT_LIBRARY NAMES xxt PATHS ${XXT_SEARCH_PATHS})
SET(XXT_FOUND FALSE)
IF (XXT_LIBRARY)
SET(XXT_FOUND TRUE)
MARK_AS_ADVANCED(XXT_LIBRARY)
ENDIF (XXT_LIBRARY)
IF (XXT_FOUND)
IF (NOT XXT_FIND_QUIETLY)
MESSAGE(STATUS "Found XXT")
ENDIF (NOT XXT_FIND_QUIETLY)
ELSE(XXT_FOUND)
IF (XXT_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find XXT")
ENDIF (XXT_FIND_REQUIRED)
ENDIF (XXT_FOUND)
......@@ -213,7 +213,7 @@ MACRO(ADD_NEKTAR_LIBRARY name component type)
ADD_DEPENDENCIES(${name} spblastk0.9b modmetis-4.0 boost tinyxml zlib)
IF (NEKTAR_USE_MPI)
TARGET_LINK_LIBRARIES( ${name} ${GSMPI_LIBRARY} )
TARGET_LINK_LIBRARIES( ${name} ${GSMPI_LIBRARY} ${XXT_LIBRARY})
ENDIF (NEKTAR_USE_MPI)
SET_COMMON_PROPERTIES(${name})
......
......@@ -13,20 +13,23 @@ IF( NEKTAR_USE_MPI )
IF (THIRDPARTY_BUILD_GSMPI)
EXTERNALPROJECT_ADD(
gsmpi-1.0
gsmpi-1.1
PREFIX ${TPSRC}
URL ${TPURL}/gsmpi-1.0.tar.bz2
URL_MD5 "a8ea5c3f9fac4695690ed344b380336f"
URL ${TPURL}/gsmpi-1.1.tar.bz2
URL_MD5 "238e6df3ca1185756a38867f5c0bbd74"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND
${CMAKE_COMMAND}
-DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist
${TPSRC}/src/gsmpi-1.0
${TPSRC}/src/gsmpi-1.1
)
SET(GSMPI_LIBRARY gsmpi CACHE FILEPATH
"GSMPI path" FORCE)
SET(XXT_LIBRARY xxt CACHE FILEPATH
"XXT path" FORCE)
ELSE (THIRDPARTY_BUILD_GSMPI)
INCLUDE (FindGSMPI)
INCLUDE (FindXXT)
ENDIF (THIRDPARTY_BUILD_GSMPI)
ENDIF( NEKTAR_USE_MPI )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment