Commit 77093c0b authored by Chris Cantwell's avatar Chris Cantwell

Updated library for rename of GSLib to GSMPI

Fixed GSMPI not building on Mac.
Removed warnings about deprecated functions on utilities.


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@3556 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent af917ad1
......@@ -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.")
......@@ -223,7 +223,7 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.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})
......
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)
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)
......@@ -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})
......
......@@ -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)
......
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