Commit 3ce6dd0a authored by Chris Cantwell's avatar Chris Cantwell

Added support for ThirdParty libraries to be automatically built using the

  ExternalProjects feature in CMake.


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@3776 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent aef14d80
......@@ -65,22 +65,7 @@ SET(NEKTAR_BUILD_REGRESSION_TESTS ON CACHE BOOL
SET(NEKTAR_BUILD_TIMINGS OFF CACHE BOOL
"Build benchmark timing codes.")
# Third party libraries to use
SET(NEKTAR_USE_ARPACK OFF CACHE BOOL
"Use Arpack routines for evaluating the eigenvalues and eigenvectors")
SET(NEKTAR_USE_FFTW OFF CACHE BOOL
"Use FFTW routines for performing the Fast Fourier Transform.")
SET(NEKTAR_USE_VTK OFF CACHE BOOL
"Use VTK library for utilities.")
SET(NEKTAR_USE_MPI OFF CACHE BOOL
"Use MPICH2 for parallelisation.")
# Build options
SET(NEKTAR_USE_TINYXML_STL ON CACHE BOOL
"Use STL with TinyXML library.")
MARK_AS_ADVANCED(NEKTAR_USE_TINYXML_STL)
SET(NEKTAR_USE_DIRECT_BLAS_CALLS OFF CACHE BOOL
"Use direct BLAS calls rather than NekMatrix calls in the StdRegions and LocalRegions sublibrary")
MARK_AS_ADVANCED(NEKTAR_USE_DIRECT_BLAS_CALLS)
......@@ -157,40 +142,17 @@ ENDIF( NOT WIN32 )
INCLUDE (NektarCommon)
# Find Libraries
INCLUDE (FindLoki)
INCLUDE (FindTinyXml)
INCLUDE (FindMetis)
INCLUDE (FindNistSparseBlas)
IF( NEKTAR_USE_MPI )
INCLUDE (FindMPI)
MARK_AS_ADVANCED(MPI_LIBRARY)
MARK_AS_ADVANCED(MPI_EXTRA_LIBRARY)
MARK_AS_ADVANCED(file_cmd)
ADD_DEFINITIONS(-DNEKTAR_USE_MPI)
INCLUDE (FindGSMPI)
INCLUDE_DIRECTORIES( ${MPI_INCLUDE_PATH} )
ENDIF( NEKTAR_USE_MPI )
IF( NEKTAR_USE_FFTW )
INCLUDE (FindFFTW)
ADD_DEFINITIONS(-DNEKTAR_USING_FFTW)
INCLUDE_DIRECTORIES(${FFTW_INCLUDE_DIR})
ENDIF( NEKTAR_USE_FFTW )
IF( NEKTAR_USE_ARPACK )
INCLUDE (FindArpack)
ADD_DEFINITIONS(-DNEKTAR_USING_ARPACK)
INCLUDE_DIRECTORIES(${ARPACK_INCLUDE_DIR})
ENDIF( NEKTAR_USE_ARPACK)
IF( NEKTAR_USE_VTK )
INCLUDE (FindVTK)
INCLUDE (${VTK_USE_FILE})
MARK_AS_ADVANCED(VTK_DIR)
ADD_DEFINITIONS(-DNEKTAR_USING_VTK)
INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
ENDIF( NEKTAR_USE_VTK )
SET(TPURL http://ae-nektar.ae.ic.ac.uk/thirdparty)
SET(TPSRC ${CMAKE_SOURCE_DIR}/ThirdParty)
INCLUDE (ThirdPartyTinyxml)
INCLUDE (ThirdPartyLoki)
INCLUDE (ThirdPartyMetis)
INCLUDE (ThirdPartySpblastk)
INCLUDE (ThirdPartyBoost)
INCLUDE (ThirdPartyFFTW)
INCLUDE (ThirdPartyArpack)
INCLUDE (ThirdPartyMPI)
INCLUDE (ThirdPartyVTK)
IF( NEKTAR_USE_MKL )
INCLUDE (FindMKL)
......@@ -254,27 +216,6 @@ ELSE( NOT WIN32 )
SET(Boost_USE_STATIC_LIBS ON)
ENDIF( NOT WIN32 )
SET(Boost_USE_MULTITHREAD ON)
SET(Boost_ADDITIONAL_VERSIONS "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46.1" "1.40" "1.40.0" "1.35.0" "1.35")
IF( NOT BOOST_ROOT )
#If the user has not set BOOST_ROOT, look in a couple common places first.
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options)
ELSE()
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options)
ENDIF()
IF(NOT Boost_ZLIB_FOUND)
FIND_PACKAGE( ZLIB )
IF (ZLIB_FOUND)
SET(Boost_ZLIB_LIBRARY ${ZLIB_LIBRARIES})
SET(Boost_ZLIB_LIBRARY_RELEASE ${ZLIB_LIBRARIES})
SET(Boost_ZLIB_LIBRARY_DEBUG ${ZLIB_LIBRARIES})
ENDIF()
ENDIF()
# Set up include directories
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
......
......@@ -161,8 +161,9 @@ MACRO(ADD_NEKTAR_EXECUTABLE name component sources)
${Boost_SYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_ZLIB_LIBRARY}
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
ADD_DEPENDENCIES(${name} boost tinyxml zlib)
IF( NEKTAR_USE_MPI )
TARGET_LINK_LIBRARIES(${name} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})
......@@ -209,9 +210,10 @@ ENDMACRO(ADD_NEKTAR_EXECUTABLE name component sources)
MACRO(ADD_NEKTAR_LIBRARY name component type)
ADD_LIBRARY(${name} ${type} ${ARGN})
# NIST Sparse BLAS only static, so link into Nektar libraries directly.
TARGET_LINK_LIBRARIES( ${name} ${NIST_SPARSE_BLAS} ${METIS_LIB})
ADD_DEPENDENCIES(${name} sbtk modmetis)
IF (NEKTAR_USE_MPI)
TARGET_LINK_LIBRARIES( ${name} ${GSMPI_LIBRARY} )
......
# Arpack
SET(NEKTAR_USE_ARPACK OFF CACHE BOOL
"Use Arpack routines for evaluating the eigenvalues and eigenvectors")
IF( NEKTAR_USE_ARPACK )
INCLUDE (FindArpack)
INCLUDE_DIRECTORIES(${ARPACK_INCLUDE_DIR})
ADD_DEFINITIONS(-DNEKTAR_USING_ARPACK)
ENDIF( NEKTAR_USE_ARPACK)
SET(THIRDPARTY_BUILD_BOOST OFF CACHE BOOL
"Build Boost libraries")
IF (THIRDPARTY_BUILD_BOOST)
INCLUDE(ExternalProject)
IF (NOT WIN32)
# Only build the libraries we need
SET(BOOST_LIB_LIST --with-system --with-iostreams --with-filesystem
--with-program_options --with-date_time --with-thread)
# We need -fPIC for 64-bit builds
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
SET(BOOST_FLAGS cxxflags=-fPIC cflags=-fPIC linkflags=-fPIC)
ENDIF ()
# Build the Zlib library separately
EXTERNALPROJECT_ADD(
zlib
PREFIX ${TPSRC}
URL ${TPURL}/zlib-1.2.3.tar.bz2
URL_MD5 "dee233bf288ee795ac96a98cc2e369b6"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ./configure --shared --prefix=${TPSRC}/dist
BUILD_IN_SOURCE 1
)
# Build Boost
EXTERNALPROJECT_ADD(
boost
PREFIX ${TPSRC}
URL ${TPURL}/boost_1_49_0.tar.bz2
URL_MD5 "0d202cb811f934282dea64856a175698"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ./bootstrap.sh --prefix=${TPSRC}/dist
BUILD_COMMAND ./b2 link=shared ${BOOST_FLAGS} ${BOOST_LIB_LIST}
--layout=system toolset=gcc install
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
# Set up CMake variables
SET(Boost_DATE_TIME_LIBRARY
${TPSRC}/dist/lib/libboost_date_time.so)
SET(Boost_FILESYSTEM_LIBRARY
${TPSRC}/dist/lib/libboost_filesystem.so)
SET(Boost_IOSTREAMS_LIBRARY
${TPSRC}/dist/lib/libboost_iostreams.so)
SET(Boost_IOSTREAMS_LIBRARY_DEBUG
${TPSRC}/dist/lib/libboost_iostreams.so)
SET(Boost_IOSTREAMS_LIBRARY_RELEASE
${TPSRC}/dist/lib/libboost_iostreams.so)
SET(Boost_PROGRAM_OPTIONS_LIBRARY
${TPSRC}/dist/lib/libboost_program_options.so)
SET(Boost_SYSTEM_LIBRARY
${TPSRC}/dist/lib/libboost_system.so)
SET(Boost_THREAD_LIBRARY
${TPSRC}/dist/lib/libboost_thread.so)
SET(Boost_THREAD_LIBRARY_DEBUG
${TPSRC}/dist/lib/libboost_thread.so)
SET(Boost_THREAD_LIBRARY_RELEASE
${TPSRC}/dist/lib/libboost_thread.so)
SET(Boost_ZLIB_LIBRARY_DEBUG
${TPSRC}/dist/lib/libz.so)
SET(Boost_ZLIB_LIBRARY_RELEASE
${TPSRC}/dist/lib/libz.so)
SET(Boost_INCLUDE_DIRS ${TPSRC}/dist/include/boost-1_49)
ELSE ()
EXTERNALPROJECT_ADD(
boost
PREFIX ${TPSRC}
URL ${TPURL}/boost_1_49_0.tar.bz2
URL_MD5 "0d202cb811f934282dea64856a175698"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND bootstrap.bat --prefix=${TPSRC}/boost
BUILD_COMMAND b2 --layout=system install
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
ENDIF ()
ELSE (THIRDPARTY_BUILD_BOOST)
SET(Boost_USE_MULTITHREAD ON)
SET(Boost_ADDITIONAL_VERSIONS "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46. 1" "1.40" "1.40.0" "1.35.0" "1.35")
IF( NOT BOOST_ROOT )
#If the user has not set BOOST_ROOT, look in a couple common places first.
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/dist)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options)
ELSE()
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options)
ENDIF()
IF(NOT Boost_ZLIB_FOUND)
FIND_PACKAGE( ZLIB )
IF (ZLIB_FOUND)
SET(Boost_ZLIB_LIBRARY ${ZLIB_LIBRARIES})
SET(Boost_ZLIB_LIBRARY_RELEASE ${ZLIB_LIBRARIES})
SET(Boost_ZLIB_LIBRARY_DEBUG ${ZLIB_LIBRARIES})
ENDIF()
ENDIF()
ENDIF (THIRDPARTY_BUILD_BOOST)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
# FFTW
SET(NEKTAR_USE_FFTW OFF CACHE BOOL
"Use FFTW routines for performing the Fast Fourier Transform.")
SET(THIRDPARTY_BUILD_FFTW OFF CACHE BOOL
"Build FFTW from ThirdParty")
IF( NEKTAR_USE_FFTW )
IF (THIRDPARTY_BUILD_FFTW)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
fftw-3.2.2
PREFIX ${TPSRC}
URL ${TPURL}/fftw-3.2.2.tar.gz
URL_MD5 "b616e5c91218cc778b5aa735fefb61ae"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ${TPSRC}/src/fftw-3.2.2/configure --prefix=${TPSRC}/dist --quiet --enable-shared --disable-dependency-tracking
)
SET(FFTW_LIB ${TPSRC}/dist/lib/libfftw3.so)
INCLUDE_DIRECTORIES(${TPSRC}/dist/include)
ELSE ()
INCLUDE (FindFFTW)
INCLUDE_DIRECTORIES(${FFTW_INCLUDE_DIR})
ENDIF()
ADD_DEFINITIONS(-DNEKTAR_USING_FFTW)
ENDIF( NEKTAR_USE_FFTW )
# Loki
SET(THIRDPARTY_BUILD_LOKI OFF CACHE BOOL
"Build TinyXML library from ThirdParty.")
IF (THIRDPARTY_BUILD_LOKI)
IF (NOT EXISTS ${TPSRC}/loki-0.1.3.tar.bz2)
file(DOWNLOAD ${TPURL}/loki-0.1.3.tar.bz2 ${TPSRC}/loki-0.1.3.tar.bz2)
ENDIF()
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf ${TPSRC}/loki-0.1.3.tar.bz2
WORKING_DIRECTORY ${TPSRC}
)
ENDIF()
INCLUDE (FindLoki)
SET(NEKTAR_USE_MPI OFF CACHE BOOL
"Use MPICH2 for parallelisation.")
SET(THIRDPARTY_BUILD_GSMPI OFF CACHE BOOL
"Build GSMPI if needed")
IF( NEKTAR_USE_MPI )
INCLUDE (FindMPI)
MARK_AS_ADVANCED(MPI_LIBRARY)
MARK_AS_ADVANCED(MPI_EXTRA_LIBRARY)
MARK_AS_ADVANCED(file_cmd)
ADD_DEFINITIONS(-DNEKTAR_USE_MPI)
INCLUDE_DIRECTORIES( ${MPI_INCLUDE_PATH} )
IF (THIRDPARTY_BUILD_GSMPI)
EXTERNALPROJECT_ADD(
gsmpi-1.0
PREFIX ${TPSRC}
URL ${TPURL}/gsmpi-1.0.tar.bz2
URL_MD5 "a8ea5c3f9fac4695690ed344b380336f"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND
${CMAKE_COMMAND}
-DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist
${TPSRC}/src/gsmpi-1.0
)
SET(GSMPI_LIBRARY ${TPSRC}/dist/lib/libgsmpi.a CACHE FILEPATH
"GSMPI path" FORCE)
ELSE (THIRDPARTY_BUILD_GSMPI)
INCLUDE (FindGSMPI)
ENDIF (THIRDPARTY_BUILD_GSMPI)
ENDIF( NEKTAR_USE_MPI )
SET(THIRDPARTY_BUILD_METIS OFF CACHE BOOL
"Build ModMetis library from ThirdParty")
IF (THIRDPARTY_BUILD_METIS)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
modmetis-4.0
PREFIX ${TPSRC}
URL ${TPURL}/modmetis-4.0.tar.bz2
URL_MD5 "4267355e04dcc2ef36f9889a98c923a5"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist ${TPSRC}/src/modmetis-4.0
)
SET(METIS_LIB ${TPSRC}/dist/lib/libmodmetis.a CACHE FILEPATH
"METIS library" FORCE)
ELSE (THIRDPARTY_BUILD_METIS)
INCLUDE (FindMetis)
ENDIF (THIRDPARTY_BUILD_METIS)
SET(THIRDPARTY_BUILD_NIST_SPBLASTK OFF CACHE BOOL
"Build NIST Sparse BLAS")
IF (THIRDPARTY_BUILD_NIST_SPBLASTK)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
spblastk0.9b
PREFIX ${TPSRC}
URL ${TPURL}/spblastk0.9b.tar.bz2
URL_MD5 "93469940f03554939a4600f431eb4d99"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist ${TPSRC}/src/spblastk0.9b
)
SET(NIST_SPARSE_BLAS ${TPSRC}/dist/lib/libsbtk.a CACHE FILEPATH
"Path to NIST Sparse BLAS." FORCE)
ELSE (THIRDPARTY_BUILD_NIST_SPBLASTK)
INCLUDE(FindNistSparseBlas)
ENDIF (THIRDPARTY_BUILD_NIST_SPBLASTK)
# TinyXML
SET(NEKTAR_USE_TINYXML_STL ON CACHE BOOL
"Use STL with TinyXML library.")
MARK_AS_ADVANCED(NEKTAR_USE_TINYXML_STL)
SET(THIRDPARTY_BUILD_TINYXML OFF CACHE BOOL
"Build TinyXML library from ThirdParty.")
IF (THIRDPARTY_BUILD_TINYXML)
#SET(TINYXML_DIR ${TPSRC}/tinyxml)
#EXTERNALPROJECT_ADD(
# tinyxml
# PREFIX ${TPSRC}/build
# URL ${TPSRC}/tinyxml.tar.bz2
# URL_MD5 "aec842139928e65aa7abdff6de0a09ec"
# CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX: PATH=${TPSRC}/ #build/dist ${TPSRC}/build/src/tinyxml
#)
#SET(TINYXML_LIB ${TPSRC}/build/dist/lib/libtinyxml.so)
#SET(TINYXML_BASE ${TPSRC}/build/src)
# Tiny XML
IF (NOT EXISTS ${TPSRC}/tinyxml_2_4_3.tar.bz2)
FILE(DOWNLOAD ${TPURL}/tinyxml_2_4_3.tar.bz2
${TPSRC}/tinyxml_2_4_3.tar.bz2)
ENDIF()
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf ${TPSRC}/tinyxml_2_4_3.tar.bz2
WORKING_DIRECTORY ${TPSRC}
)
ENDIF (THIRDPARTY_BUILD_TINYXML)
INCLUDE (FindTinyXml)
SET(TINYXML_LIB tinyxml)
SET(TINYXML_BASE ${TPSRC})
SET(NEKTAR_USE_VTK OFF CACHE BOOL
"Use VTK library for utilities.")
IF( NEKTAR_USE_VTK )
INCLUDE (FindVTK)
IF (NOT VTK_FOUND)
MESSAGE(FATAL_ERROR "VTK not found")
ENDIF (NOT VTK_FOUND)
INCLUDE (${VTK_USE_FILE})
MARK_AS_ADVANCED(VTK_DIR)
ADD_DEFINITIONS(-DNEKTAR_USING_VTK)
INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
ENDIF( NEKTAR_USE_VTK )
......@@ -6,7 +6,7 @@ SET(LinkLibraries
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET(LocProject1DSource LocProject1D.cpp)
......
......@@ -7,7 +7,7 @@ SET(LinkLibraries
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
optimized sbtk debug sbtk
)
......
......@@ -7,7 +7,7 @@ SET(LinkLibraries
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
optimized sbtk debug sbtk
)
......
......@@ -5,7 +5,7 @@ SET(LinkLibraries
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
#SET(SpatialDomains1DSource Graph1D.cpp)
......
SET(LinkLibraries
optimized StdRegions debug StdRegions-g
optimized LibUtilities debug LibUtilities-g
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET(StdProject1DSource StdProject1D.cpp)
......
......@@ -307,7 +307,7 @@ TARGET_LINK_LIBRARIES(LibUtilities
${Boost_THREAD_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
tinyxml
${TINYXML_LIB}
)
SET_LAPACK_LINK_LIBRARIES(LibUtilities)
SET(PrecompiledHeaderName LibUtilities/LibUtilities.h)
......
......@@ -50,7 +50,7 @@ TARGET_LINK_LIBRARIES(LocalRegions
optimized LibUtilities debug LibUtilities-g
optimized SpatialDomains debug SpatialDomains-g
optimized StdRegions debug StdRegions-g
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
${Boost_THREAD_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
)
......
......@@ -86,7 +86,7 @@ TARGET_LINK_LIBRARIES(MultiRegions
optimized SpatialDomains debug SpatialDomains-g
optimized LocalRegions debug LocalRegions-g
optimized StdRegions debug StdRegions-g
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
${Boost_THREAD_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
)
......
......@@ -83,7 +83,7 @@ ADD_NEKTAR_LIBRARY(SpatialDomains lib ${NEKTAR_LIBRARY_TYPE} ${SPATIAL_DOMAINS_S
TARGET_LINK_LIBRARIES(SpatialDomains
optimized LibUtilities debug LibUtilities-g
optimized StdRegions debug StdRegions-g
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
${Boost_THREAD_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
......@@ -96,7 +96,4 @@ INSTALL(FILES ${SPATIAL_DOMAINS_HEADERS} DESTINATION ${NEKTAR_INCLUDE_DIR}/Spati
ADD_NEKTAR_LIBRARY(tinyxml lib STATIC ${TINYXML_SOURCES} ${TINYXML_HEADERS})
#INSTALL(TARGETS tinyxml RUNTIME DESTINATION ${NEKTAR_BIN_DIR} OPTIONAL
# ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL
# LIBRARY DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL)
......@@ -48,7 +48,7 @@ ADD_DEFINITIONS(-DSTD_REGIONS_EXPORTS)
ADD_NEKTAR_LIBRARY(StdRegions lib ${NEKTAR_LIBRARY_TYPE} ${STD_REGIONS_SOURCES} ${STD_REGIONS_HEADERS})
TARGET_LINK_LIBRARIES(StdRegions
optimized LibUtilities debug LibUtilities-g
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
${Boost_THREAD_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
)
......
......@@ -17,7 +17,7 @@ MACRO(ADD_SOLVER_EXECUTABLE name component source)
${Boost_ZLIB_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET_LAPACK_LINK_LIBRARIES(${name})
......
......@@ -13,7 +13,7 @@ MACRO(ADD_UTILITIES_EXECUTABLE name component source)
${Boost_ZLIB_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
optimized tinyxml debug tinyxml
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET_LAPACK_LINK_LIBRARIES(${name})
......
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