Commit 2bacb808 authored by Chris Cantwell's avatar Chris Cantwell

Added changes to CMake from Allen.

parent b491592a
......@@ -36,26 +36,72 @@ SET(NEKTAR++_DEFINITIONS @NEKTAR_DEFINITIONS@)
SET(NEKTAR++_LIBRARIES @NEKTAR++_LIBRARIES@)
SET(NEKTAR++_TP_INCLUDE_DIRS
"${NEKTAR++_ROOT_DIR}/@NEKTAR_INCLUDE_DIR@/ThirdParty"
"@TINYXML_CONFIG_INCLUDE_DIR@"
"@LOKI_CONFIG_INCLUDE_DIR@"
# Metis is in main TP include directory
"@SCOTCH_CONFIG_INCLUDE_DIR@"
"@Boost_CONFIG_INCLUDE_DIR@"
"@ZLIB_CONFIG_INCLUDE_DIR@"
"@FFTW_CONFIG_INCLUDE_DIR@"
"@ARPACK_INCLUDE_DIR@"
"@MPI_INCLUDE_PATH@"
"@PETSC_CONFIG_INCLUDE_DIR@"
"@VTK_INCLUDE_DIRS@"
)
SET(NEKTAR++_TP_LIBRARIES @Boost_LIBRARIES@ "@MPI_LIBRARY@" "@MPI_EXTRA_LIBRARY@")
SET(NEKTAR++_TP_LIBRARY_DIRS "@Boost_CONFIG_LIBRARY_DIR@")
"${NEKTAR++_ROOT_DIR}/@NEKTAR_INCLUDE_DIR@/ThirdParty")
SET(NEKTAR++_TP_LIBRARIES "")
SET(NEKTAR++_TP_LIBRARY_DIRS "")
# Set up Boost and other ThirdParty include directories.
SET(Boost_INCLUDE_DIRS "@Boost_CONFIG_INCLUDE_DIR@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
SET(Boost_LIBRARIES @Boost_LIBRARIES@)
SET(Boost_LIBRARY_DIRS "@Boost_CONFIG_LIBRARY_DIR@")
SET(NEKTAR++_TP_LIBRARIES
${NEKTAR++_TP_LIBRARIES} ${Boost_LIBRARIES})
SET(LOKI_INCLUDE_DIRS "@LOKI_CONFIG_INCLUDE_DIR@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${LOKI_INCLUDE_DIRS})
SET(TINYXML_INCLUDE_DIRS "@TINYXML_CONFIG_INCLUDE_DIR@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${TINYXML_INCLUDE_DIRS})
SET(ZLIB_INCLUDE_DIRS "@ZLIB_CONFIG_INCLUDE_DIR@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
SET(NEKTAR_USE_MPI "@NEKTAR_USE_MPI@")
IF (NEKTAR_USE_MPI)
LIST(APPEND NEKTAR++_DEFINITIONS -DNEKTAR_USE_MPI)
ENDIF ()
IF( NEKTAR_USE_MPI )
SET(MPI_LIBRARY "@MPI_LIBRARY@")
SET(MPI_EXTRA_LIBRARY "@MPI_EXTRA_LIBRARY@")
SET(MPI_INCLUDE_PATH "@MPI_INCLUDE_PATH@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${MPI_INCLUDE_PATH})
SET(NEKTAR++_TP_LIBRARIES
${NEKTAR++_TP_LIBRARIES} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})
SET(NEKTAR++_DEFINITIONS
"${NEKTAR++_DEFINITIONS} -DNEKTAR_USE_MPI")
ENDIF( NEKTAR_USE_MPI )
SET(NEKTAR_USE_SCOTCH "@NEKTAR_USE_SCOTCH@")
IF( NEKTAR_USE_SCOTCH )
SET(SCOTCH_INCLUDE_DIRS "@SCOTCH_CONFIG_INCLUDE_DIR@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${SCOTCH_INCLUDE_DIRS})
ENDIF( NEKTAR_USE_SCOTCH )
SET(NEKTAR_USE_FFTW "@NEKTAR_USE_FFTW@")
IF( NEKTAR_USE_FFTW )
SET(FFTW_INCLUDE_DIR "@FFTW_INCLUDE_DIR@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${FFTW_INCLUDE_DIR})
ENDIF( NEKTAR_USE_FFTW )
SET(NEKTAR_USE_ARPACK "@NEKTAR_USE_ARPACK@")
IF( NEKTAR_USE_ARPACK )
SET(ARPACK_INCLUDE_DIR "@ARPACK_INCLUDE_DIR@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${ARPACK_INCLUDE_DIR})
ENDIF( NEKTAR_USE_ARPACK )
SET(NEKTAR_USE_VTK "@NEKTAR_USE_VTK@")
IF( NEKTAR_USE_VTK )
SET(VTK_INCLUDE_DIRS "@VTK_INCLUDE_DIRS@")
SET(NEKTAR++_TP_INCLUDE_DIRS
${NEKTAR++_TP_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS})
ENDIF( NEKTAR_USE_VTK )
# find and add Nektar++ libraries
INCLUDE(${NEKTAR++_LIBRARY_DIRS}/cmake/Nektar++Libraries.cmake)
......@@ -64,4 +110,8 @@ INCLUDE(${NEKTAR++_LIBRARY_DIRS}/cmake/Nektar++Libraries.cmake)
if(${CMAKE_SYSTEM} MATCHES "Linux.*")
set(NEKTAR++_TP_LIBRARIES ${NEKTAR++_TP_LIBRARIES} rt)
SET(NEKTAR++_DEFINITIONS "${NEKTAR++_DEFINITIONS} -pthread")
endif(${CMAKE_SYSTEM} MATCHES "Linux.*")
\ No newline at end of file
endif(${CMAKE_SYSTEM} MATCHES "Linux.*")
if(${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET(NEKTAR++_DEFINITIONS "${NEKTAR++_DEFINITIONS} -Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}")
endif(${CMAKE_SYSTEM} MATCHES "Darwin-*")
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