diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 753b5508dae785ac1943323f41339b180b3ba008..bc6e526d4e17597d53713c584da25629a5ed877d 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -53,7 +53,7 @@ SET(NEKTAR_USE_MPI OFF CACHE BOOL "Use MPICH2 for parallelisation.") SET(MPI_SYNC OFF CACHE BOOL "Use synchronous MPI calls when sending data.") MARK_AS_ADVANCED(MPI_SYNC) IF( NEKTAR_USE_MPI ) - INCLUDE (FindGSLib) + INCLUDE (FindGSMPI) ENDIF( NEKTAR_USE_MPI ) SET(NEKTAR_USE_TINYXML_STL ON CACHE BOOL "Use STL with TinyXML library.") @@ -219,11 +219,11 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake ${CMAKE_SOURCE_DIR}/FindNativeBlasLapack.cmake ${CMAKE_SOURCE_DIR}/FindMKL.cmake ${CMAKE_SOURCE_DIR}/FindMetis.cmake - ${CMAKE_SOURCE_DIR}/FindFFTW.cmake + ${CMAKE_SOURCE_DIR}/FindFFTW.cmake ${CMAKE_SOURCE_DIR}/FindWin32Lapack.cmake ${CMAKE_SOURCE_DIR}/NektarCommon.cmake ${CMAKE_SOURCE_DIR}/FindTinyXml.cmake - ${CMAKE_SOURCE_DIR}/FindGSLib.cmake + ${CMAKE_SOURCE_DIR}/FindGSMPI.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/library/FindGSLib.cmake b/library/FindGSLib.cmake deleted file mode 100644 index 3383e9b0d393b672bf14abdcc9bedceb3897a91f..0000000000000000000000000000000000000000 --- a/library/FindGSLib.cmake +++ /dev/null @@ -1,25 +0,0 @@ - -SET(GS_LIB_SEARCH_PATHS - ${CMAKE_SOURCE_DIR}/../ThirdParty/gslib-1.0/ - ${CMAKE_SOURCE_DIR}/../ThirdParty/gslib-1.0/build/ - ${CMAKE_SOURCE_DIR}/../../ThirdParty/gslib-1.0/ - ${CMAKE_SOURCE_DIR}/../../ThirdParty/gslib-1.0/build ) - -FIND_LIBRARY(GS_LIB NAMES gs PATHS ${GS_LIB_SEARCH_PATHS}) - - -SET(GS_FOUND FALSE) -IF (GS_LIB) - SET(GS_FOUND TRUE) - MARK_AS_ADVANCED(GS_LIB) -ENDIF (GS_LIB) - -IF (GS_FOUND) - IF (NOT GS_LIB_FIND_QUIETLY) - MESSAGE(STATUS "Found GSLib") - ENDIF (NOT GS_LIB_FIND_QUIETLY) -ELSE(GS_FOUND) - IF (GS_LIB_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find GSLib") - ENDIF (GS_LIB_FIND_REQUIRED) -ENDIF (GS_FOUND) diff --git a/library/FindGSMPI.cmake b/library/FindGSMPI.cmake new file mode 100644 index 0000000000000000000000000000000000000000..41016726d8f198969d4bcb438824ad72cc7792d3 --- /dev/null +++ b/library/FindGSMPI.cmake @@ -0,0 +1,25 @@ + +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 ) + +FIND_LIBRARY(GSMPI_LIBRARY NAMES gsmpi PATHS ${GSMPI_SEARCH_PATHS}) + + +SET(GSMPI_FOUND FALSE) +IF (GSMPI_LIBRARY) + SET(GSMPI_FOUND TRUE) + MARK_AS_ADVANCED(GSMPI_LIBRARY) +ENDIF (GSMPI_LIBRARY) + +IF (GSMPI_FOUND) + IF (NOT GSMPI_FIND_QUIETLY) + MESSAGE(STATUS "Found GSMPI") + ENDIF (NOT GSMPI_FIND_QUIETLY) +ELSE(GSMPI_FOUND) + IF (GSMPI_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find GSLib") + ENDIF (GSMPI_FIND_REQUIRED) +ENDIF (GSMPI_FOUND) diff --git a/library/NektarCommon.cmake b/library/NektarCommon.cmake index bd21efc41241380ae7a5fe88ab725e2f9671faf7..b9f838fd3bf8fa6c7bd6b40b0874d4037eb27dd7 100644 --- a/library/NektarCommon.cmake +++ b/library/NektarCommon.cmake @@ -339,7 +339,7 @@ MACRO(ADD_NEKTAR_LIBRARY name component type) TARGET_LINK_LIBRARIES( ${name} ${NIST_SPARSE_BLAS} ${METIS_LIB}) IF (NEKTAR_USE_MPI) - TARGET_LINK_LIBRARIES( ${name} ${GS_LIB} ) + TARGET_LINK_LIBRARIES( ${name} ${GSMPI_LIBRARY} ) ENDIF (NEKTAR_USE_MPI) SET_COMMON_PROPERTIES(${name}) diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt index d1a63f49b238ef22897343db36455a8695de67ad..ae51f6ebf52d3e73a418ffe7700ce3bab32ce950 100644 --- a/utilities/CMakeLists.txt +++ b/utilities/CMakeLists.txt @@ -100,15 +100,6 @@ MACRO(ADD_UTILITIES_EXECUTABLE name component source) ENDMACRO(ADD_UTILITIES_EXECUTABLE name component source) -MACRO(SET_COMMON_PROPERTIES name) - - SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX -g) - SET_TARGET_PROPERTIES(${name} PROPERTIES MINSIZEREL_POSTFIX -ms) - SET_TARGET_PROPERTIES(${name} PROPERTIES RELWITHDEBINFO_POSTFIX -rg) - -ENDMACRO(SET_COMMON_PROPERTIES name) - - SUBDIRS( PreProcessing PostProcessing) SET(CPACK_COMPONENTS_ALL util)