Commit 99f794ec authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'master' into feature/INCNSPressureOutflowFix

parents 2368b430 610b8855
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build,
options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release
RelWithDebInfo MinSizeRel.")
......@@ -164,6 +164,7 @@ ENDIF ()
INCLUDE (ThirdPartyTinyxml)
INCLUDE (ThirdPartyLoki)
INCLUDE (ThirdPartyMetis)
INCLUDE (ThirdPartyScotch)
INCLUDE (ThirdPartyBoost)
INCLUDE (ThirdPartyZlib)
INCLUDE (ThirdPartyFFTW)
......@@ -300,6 +301,7 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake
${CMAKE_SOURCE_DIR}/cmake/FindNativeBlasLapack.cmake
${CMAKE_SOURCE_DIR}/cmake/FindMKL.cmake
${CMAKE_SOURCE_DIR}/cmake/FindMetis.cmake
${CMAKE_SOURCE_DIR}/cmake/FindScotch.cmake
${CMAKE_SOURCE_DIR}/cmake/FindFFTW.cmake
${CMAKE_SOURCE_DIR}/cmake/FindWin32Lapack.cmake
${CMAKE_SOURCE_DIR}/cmake/FindTinyXml.cmake
......
......@@ -20,7 +20,7 @@ ENDIF (METIS_LIB)
IF (METIS_FOUND)
IF (NOT METIS_LIB_FIND_QUIETLY)
MESSAGE(STATUS "Found Metis")
MESSAGE(STATUS "Found Metis: ${METIS_LIB}")
ENDIF (NOT METIS_LIB_FIND_QUIETLY)
ELSE(METIS_FOUND)
IF (METIS_LIB_FIND_REQUIRED)
......
SET(SCOTCH_SEARCH_PATHS
${CMAKE_SOURCE_DIR}/ThirdParty/scotch_6.0.0/
${CMAKE_SOURCE_DIR}/ThirdParty/scotch_6.0.0/build/
${CMAKE_SOURCE_DIR}/../ThirdParty/scotch_6.0.0/
${CMAKE_SOURCE_DIR}/../ThirdParty/scotch_6.0.0/build
${CMAKE_SOURCE_DIR}/ThirdParty/dist/lib
${CMAKE_SOURCE_DIR}/../ThirdParty/dist/lib)
FIND_LIBRARY(SCOTCH_LIB NAMES scotch PATHS ${SCOTCH_SEARCH_PATHS})
FIND_LIBRARY(SCOTCHERR_LIB NAMES scotcherr PATHS ${SCOTCH_SEARCH_PATHS})
SET(SCOTCH_FOUND FALSE)
IF (SCOTCH_LIB AND SCOTCHERR_LIB)
SET(SCOTCH_FOUND TRUE)
GET_FILENAME_COMPONENT(SCOTCH_PATH ${SCOTCH_LIB} PATH)
INCLUDE_DIRECTORIES(${SCOTCH_PATH}/../../include)
MARK_AS_ADVANCED(SCOTCH_PATH)
MARK_AS_ADVANCED(SCOTCH_LIB)
MARK_AS_ADVANCED(SCOTCHERR_LIB)
ENDIF (SCOTCH_LIB AND SCOTCHERR_LIB)
IF (SCOTCH_FOUND)
IF (NOT SCOTCH_LIB_FIND_QUIETLY)
MESSAGE(STATUS "Found Scotch: ${SCOTCH_LIB}, ${SCOTCHERR_LIB}")
ENDIF (NOT SCOTCH_LIB_FIND_QUIETLY)
ELSE(SCOTCH_FOUND)
IF (SCOTCH_LIB_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Scotch")
ENDIF (SCOTCH_LIB_FIND_REQUIRED)
ENDIF (SCOTCH_FOUND)
......@@ -4,60 +4,7 @@ MACRO(CHANGE_EXTENSION output var new_ext)
SET(${output} ${Path}/${FileName}.${new_ext})
ENDMACRO()
MACRO(SET_LAPACK_LINK_LIBRARIES name)
# Link FFTW before MKL to ensure FFTW original implementation used.
IF( NEKTAR_USE_FFTW )
TARGET_LINK_LIBRARIES(${name} optimized ${FFTW_LIB} debug ${FFTW_LIB})
ENDIF( NEKTAR_USE_FFTW )
IF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_MKL AND MKL_FOUND )
TARGET_LINK_LIBRARIES(${name} ${MKL} )
ENDIF( NEKTAR_USE_MKL AND MKL_FOUND )
IF( NEKTAR_USE_ACML AND ACML_FOUND )
TARGET_LINK_LIBRARIES(${name} ${ACML_TARGET_LINK_LIBRARIES} )
ENDIF( NEKTAR_USE_ACML AND ACML_FOUND )
IF( NEKTAR_USE_ACCELERATE_FRAMEWORK )
TARGET_LINK_LIBRARIES(${name} ${ACCELERATE_FRAMEWORK_LINK_FLAGS})
ENDIF ( NEKTAR_USE_ACCELERATE_FRAMEWORK )
IF( NEKTAR_USE_CHUD_FRAMEWORK )
TARGET_LINK_LIBRARIES(${name} ${CHUD_FRAMEWORK_LINK_FLAGS})
ENDIF ( NEKTAR_USE_CHUD_FRAMEWORK )
IF( NEKTAR_USE_WIN32_LAPACK )
TARGET_LINK_LIBRARIES(${name} ${WIN32_LAPACK} ${WIN32_BLAS})
INSTALL(FILES ${WIN32_LAPACK_DLL} ${WIN32_BLAS_DLL}
DESTINATION ${NEKTAR_BIN_DIR})
ENDIF( NEKTAR_USE_WIN32_LAPACK )
IF( NEKTAR_USE_OPENBLAS AND OPENBLAS_FOUND )
TARGET_LINK_LIBRARIES(${name} ${NATIVE_LAPACK} ${OPENBLAS})
ENDIF( NEKTAR_USE_OPENBLAS AND OPENBLAS_FOUND )
IF( NEKTAR_USE_SMV AND SMV_FOUND )
TARGET_LINK_LIBRARIES(${name} ${SMV_LIBRARY})
ENDIF( NEKTAR_USE_SMV AND SMV_FOUND )
IF( NEKTAR_USE_SYSTEM_BLAS_LAPACK )
TARGET_LINK_LIBRARIES(${name} ${NATIVE_LAPACK} ${NATIVE_BLAS})
ENDIF( NEKTAR_USE_SYSTEM_BLAS_LAPACK )
ENDIF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_METIS )
TARGET_LINK_LIBRARIES(${name} optimized ${METIS_LIB} debug
${METIS_LIB} )
ENDIF( NEKTAR_USE_METIS )
IF( NEKTAR_USE_ARPACK )
TARGET_LINK_LIBRARIES(${name} optimized ${ARPACK_LIB} debug
${ARPACK_LIB} )
ENDIF( NEKTAR_USE_ARPACK )
ENDMACRO(SET_LAPACK_LINK_LIBRARIES name)
MACRO(SET_COMMON_PROPERTIES name)
SET_TARGET_PROPERTIES(${name} PROPERTIES VERSION ${NEKTAR_VERSION})
......@@ -157,39 +104,7 @@ MACRO(ADD_NEKTAR_EXECUTABLE name component sources)
SET_COMMON_PROPERTIES(${name})
IF( NEKTAR_USE_MKL AND MKL_FOUND )
TARGET_LINK_LIBRARIES(${name} ${MKL} )
SET_TARGET_PROPERTIES(${name}
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} -DMKL_ILP64")
ENDIF( NEKTAR_USE_MKL AND MKL_FOUND )
TARGET_LINK_LIBRARIES(${name}
optimized LibUtilities debug LibUtilities-g
${Boost_THREAD_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${ZLIB_LIBRARY}
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
ADD_DEPENDENCIES(${name} boost tinyxml zlib-1.2.7)
IF( NEKTAR_USE_MPI )
IF (NOT MPI_BUILTIN)
TARGET_LINK_LIBRARIES(${name} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})
SET_TARGET_PROPERTIES(${name}
PROPERTIES LINK_FLAGS "${THE_LINK_FLAGS} ${MPI_LINK_FLAGS}")
SET_TARGET_PROPERTIES(${name}
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} ${MPI_COMPILE_FLAGS}")
ENDIF()
ENDIF( NEKTAR_USE_MPI )
IF( ${CMAKE_SYSTEM} MATCHES "Linux.*" )
TARGET_LINK_LIBRARIES(${name} optimized rt debug rt)
# The boost thread library needs pthread on linux.
GET_TARGET_PROPERTY(THE_COMPILE_FLAGS ${name} COMPILE_FLAGS)
GET_TARGET_PROPERTY(THE_LINK_FLAGS ${name} LINK_FLAGS)
......@@ -226,12 +141,7 @@ ENDMACRO(ADD_NEKTAR_EXECUTABLE name component sources)
MACRO(ADD_NEKTAR_LIBRARY name component type)
ADD_LIBRARY(${name} ${type} ${ARGN})
TARGET_LINK_LIBRARIES( ${name} ${METIS_LIB} )
ADD_DEPENDENCIES(${name} modmetis-5.1.0 boost tinyxml zlib-1.2.7)
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${component})
IF (NEKTAR_USE_MPI)
TARGET_LINK_LIBRARIES( ${name} ${GSMPI_LIBRARY} ${XXT_LIBRARY})
ENDIF (NEKTAR_USE_MPI)
SET_COMMON_PROPERTIES(${name})
......
......@@ -93,6 +93,7 @@ IF (THIRDPARTY_BUILD_BOOST)
)
ENDIF ()
ELSE (THIRDPARTY_BUILD_BOOST)
ADD_CUSTOM_TARGET(boost ALL)
SET(Boost_DEBUG 0)
SET(Boost_NO_BOOST_CMAKE ON)
#If the user has not set BOOST_ROOT, look in a couple common places first.
......
OPTION(NEKTAR_USE_SCOTCH
"Use Scotch library for performing mesh partitioning." OFF)
CMAKE_DEPENDENT_OPTION(THIRDPARTY_BUILD_SCOTCH
"Build Scotch library from ThirdParty" OFF
"NEKTAR_USE_SCOTCH" OFF)
IF( NEKTAR_USE_SCOTCH )
IF (THIRDPARTY_BUILD_SCOTCH)
UNSET(FLEX CACHE)
FIND_PROGRAM(FLEX flex)
IF(NOT FLEX)
MESSAGE(FATAL_ERROR
"'flex' lexical parser not found. Cannot build scotch.")
ENDIF(NOT FLEX)
SET(SCOTCH_SRC ${TPSRC}/src/scotch-6.0.0/src)
IF (APPLE)
SET(SCOTCH_MAKE Makefile.inc.i686_mac_darwin8)
SET(SCOTCH_LDFLAGS "")
SET(SCOTCH_CFLAGS "-O3 -Drestrict=__restrict -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DCOMMON_PTHREAD_BARRIER")
ELSE ()
IF (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
SET(SCOTCH_MAKE Makefile.inc.x86-64_pc_linux2)
SET(SCOTCH_CFLAGS "-O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64")
ELSE ()
SET(SCOTCH_MAKE Makefile.inc.i686_pc_linux2)
SET(SCOTCH_CFLAGS "-O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict")
ENDIF ()
SET(SCOTCH_LDFLAGS "-lz -lm -lrt -lpthread")
ENDIF ()
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
scotch-6.0.0
PREFIX ${TPSRC}
URL ${TPURL}/scotch_6.0.0.tar.gz
URL_MD5 "ba117428c0a6cd97d0c93e8b872bb3fe"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND rm -f ${SCOTCH_SRC}/Makefile.inc
COMMAND ln -s
${SCOTCH_SRC}/Make.inc/${SCOTCH_MAKE}
${SCOTCH_SRC}/Makefile.inc
BUILD_COMMAND $(MAKE) -C ${TPSRC}/src/scotch-6.0.0/src
"CFLAGS=${SCOTCH_CFLAGS}"
"LDFLAGS=${SCOTCH_LDFLAGS}"
"CLIBFLAGS=-fPIC" scotch
INSTALL_COMMAND $(MAKE) -C ${TPSRC}/src/scotch-6.0.0/src
prefix=${TPSRC}/dist install
)
SET(SCOTCH_LIB scotch CACHE FILEPATH
"Scotch library" FORCE)
SET(SCOTCHERR_LIB scotcherr CACHE FILEPATH
"Scotch error library" FORCE)
SET(SCOTCHMETIS_LIB scotchmetis CACHE FILEPATH
"Scotch Metis interface library" FORCE)
MARK_AS_ADVANCED(SCOTCH_LIB)
MARK_AS_ADVANCED(SCOTCHERR_LIB)
MARK_AS_ADVANCED(SCOTCHMETIS_LIB)
LINK_DIRECTORIES(${TPSRC}/dist/lib)
INCLUDE_DIRECTORIES(${TPSRC}/dist/include)
MESSAGE(STATUS "Build Scotch: ${TPSRC}/dist/lib/lib${SCOTCH_LIB}.a")
ELSE (THIRDPARTY_BUILD_SCOTCH)
INCLUDE (FindScotch)
ENDIF (THIRDPARTY_BUILD_SCOTCH)
ENDIF( NEKTAR_USE_SCOTCH )
......@@ -6,34 +6,29 @@ OPTION(THIRDPARTY_BUILD_TINYXML
"Build TinyXML library from ThirdParty." ON)
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}
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
tinyxml-2.4.3
PREFIX ${TPSRC}
URL ${TPURL}/tinyxml_2_4_3-1.tar.bz2
URL_MD5 "a00f5e3b547b803977c5744547a688f7"
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist
-DCMAKE_CXX_FLAGS:STRING=-DTIXML_USE_STL
${TPSRC}/src/tinyxml-2.4.3
)
SET(TINYXML_INCLUDE_DIR ${TPSRC}/tinyxml)
SET(TINYXML_BASE ${TPSRC})
SET(TINYXML_SRC_DIR ${TPSRC}/tinyxml)
SET(TINYXML_LIB tinyxml CACHE FILEPATH
"Tinyxml library" FORCE)
MARK_AS_ADVANCED(TINYXML_LIB)
LINK_DIRECTORIES(${TPSRC}/dist/lib)
INCLUDE_DIRECTORIES(${TPSRC}/dist/include)
ELSE (THIRDPARTY_BUILD_TINYXML)
INCLUDE (FindTinyXml)
ENDIF (THIRDPARTY_BUILD_TINYXML)
SET(TINYXML_LIB tinyxml)
INCLUDE_DIRECTORIES(SYSTEM ${TINYXML_BASE})
......@@ -35,6 +35,5 @@ IF( NEKTAR_USE_VTK )
INCLUDE (${VTK_USE_FILE})
MARK_AS_ADVANCED(VTK_DIR)
ADD_DEFINITIONS(-DNEKTAR_USING_VTK)
INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
ENDIF( NEKTAR_USE_VTK )
......@@ -38,29 +38,29 @@ SET(TimeIntegrationDemoSources
#ADD_NEKTAR_EXECUTABLE(MemoryManager MemoryManagerSources )
ADD_NEKTAR_EXECUTABLE(Matrix demos VecMatSources)
SET_LAPACK_LINK_LIBRARIES(Matrix)
TARGET_LINK_LIBRARIES(Matrix LibUtilities)
ADD_NEKTAR_EXECUTABLE(PartitionAnalyse demos PartitionAnalyseSources)
SET_LAPACK_LINK_LIBRARIES(PartitionAnalyse)
TARGET_LINK_LIBRARIES(PartitionAnalyse LibUtilities)
ADD_NEKTAR_EXECUTABLE(FoundationDemo demos FoundationSources )
SET_LAPACK_LINK_LIBRARIES(FoundationDemo)
TARGET_LINK_LIBRARIES(FoundationDemo LibUtilities)
ADD_NEKTAR_EXECUTABLE(NodalTriFeketeDemo demos NodalTriFeketeSources )
SET_LAPACK_LINK_LIBRARIES(NodalTriFeketeDemo)
TARGET_LINK_LIBRARIES(NodalTriFeketeDemo LibUtilities)
ADD_NEKTAR_EXECUTABLE(NodalTriElecDemo demos NodalTriElecSources)
SET_LAPACK_LINK_LIBRARIES(NodalTriElecDemo)
TARGET_LINK_LIBRARIES(NodalTriElecDemo LibUtilities)
ADD_NEKTAR_EXECUTABLE(NodalTriEvenlySpacedDemo demos NodalTriEvenlySpacedSources)
SET_LAPACK_LINK_LIBRARIES(NodalTriEvenlySpacedDemo)
TARGET_LINK_LIBRARIES(NodalTriEvenlySpacedDemo LibUtilities)
ADD_NEKTAR_EXECUTABLE(NodalTetEvenlySpacedDemo demos NodalTetEvenlySpacedSources)
SET_LAPACK_LINK_LIBRARIES(NodalTetEvenlySpacedDemo)
TARGET_LINK_LIBRARIES(NodalTetEvenlySpacedDemo LibUtilities)
ADD_NEKTAR_EXECUTABLE(NodalTetElecDemo demos NodalTetElecSources)
SET_LAPACK_LINK_LIBRARIES(NodalTetElecDemo)
TARGET_LINK_LIBRARIES(NodalTetElecDemo LibUtilities)
ADD_NEKTAR_EXECUTABLE(TimeIntegrationDemo demos TimeIntegrationDemoSources)
SET_LAPACK_LINK_LIBRARIES(TimeIntegrationDemo)
TARGET_LINK_LIBRARIES(TimeIntegrationDemo LibUtilities)
SET(LinkLibraries
optimized LocalRegions debug LocalRegions-g
optimized SpatialDomains debug SpatialDomains-g
optimized StdRegions debug StdRegions-g
optimized LibUtilities debug LibUtilities-g
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${ZLIB_LIBRARY_RELEASE} debug ${ZLIB_LIBRARY_DEBUG}
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET(LinkLibraries LocalRegions)
SET(LocProject1DSource LocProject1D.cpp)
ADD_NEKTAR_EXECUTABLE(LocProject1D demos LocProject1DSource)
TARGET_LINK_LIBRARIES(LocProject1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(LocProject1D)
SET(LocProject2DSource LocProject2D.cpp)
ADD_NEKTAR_EXECUTABLE(LocProject2D demos LocProject2DSource)
TARGET_LINK_LIBRARIES(LocProject2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(LocProject2D)
SET(LocProject3DSource LocProject3D.cpp)
ADD_NEKTAR_EXECUTABLE(LocProject3D demos LocProject3DSource)
TARGET_LINK_LIBRARIES(LocProject3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(LocProject3D)
SET(LocProject_Diff1DSource LocProject_Diff1D.cpp)
ADD_NEKTAR_EXECUTABLE(LocProject_Diff1D demos LocProject_Diff1DSource)
TARGET_LINK_LIBRARIES(LocProject_Diff1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(LocProject_Diff1D)
SET(LocProject_Diff2DSource LocProject_Diff2D.cpp)
ADD_NEKTAR_EXECUTABLE(LocProject_Diff2D demos LocProject_Diff2DSource)
TARGET_LINK_LIBRARIES(LocProject_Diff2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(LocProject_Diff2D)
SET(LocProject_Diff3DSource LocProject_Diff3D.cpp)
ADD_NEKTAR_EXECUTABLE(LocProject_Diff3D demos LocProject_Diff3DSource)
TARGET_LINK_LIBRARIES(LocProject_Diff3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(LocProject_Diff3D)
# Generate list of available subdirectories
FILE(GLOB dir_list "*")
......
SET(LinkLibraries
optimized MultiRegions debug MultiRegions-g
optimized LocalRegions debug LocalRegions-g
optimized SpatialDomains debug SpatialDomains-g
optimized StdRegions debug StdRegions-g
optimized LibUtilities debug LibUtilities-g
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${ZLIB_LIBRARY_RELEASE} debug ${ZLIB_LIBRARY_DEBUG}
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET(LinkLibraries MultiRegions)
SET(HelmholtzCont1DSource Helmholtz1D.cpp)
ADD_NEKTAR_EXECUTABLE(Helmholtz1D demos HelmholtzCont1DSource)
TARGET_LINK_LIBRARIES(Helmholtz1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Helmholtz1D)
SET(HelmholtzCont2DSource Helmholtz2D.cpp)
ADD_NEKTAR_EXECUTABLE(Helmholtz2D demos HelmholtzCont2DSource)
TARGET_LINK_LIBRARIES(Helmholtz2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Helmholtz2D)
#SET(Helmholtz2DHomo1DSource Helmholtz2DHomo1D.cpp)
#ADD_NEKTAR_EXECUTABLE(Helmholtz2DHomo1D Helmholtz2DHomo1DSource)
#TARGET_LINK_LIBRARIES(Helmholtz2DHomo1D ${LinkLibraries})
#SET_LAPACK_LINK_LIBRARIES(Helmholtz2DHomo1D)
SET(HelmholtzCont3DSource Helmholtz3D.cpp)
ADD_NEKTAR_EXECUTABLE(Helmholtz3D demos HelmholtzCont3DSource)
TARGET_LINK_LIBRARIES(Helmholtz3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Helmholtz3D)
SET(Helmholtz3DHomo1DSource Helmholtz3DHomo1D.cpp)
ADD_NEKTAR_EXECUTABLE(Helmholtz3DHomo1D demos Helmholtz3DHomo1DSource)
TARGET_LINK_LIBRARIES(Helmholtz3DHomo1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Helmholtz3DHomo1D)
SET(Helmholtz3DHomo2DSource Helmholtz3DHomo2D.cpp)
ADD_NEKTAR_EXECUTABLE(Helmholtz3DHomo2D demos Helmholtz3DHomo2DSource)
TARGET_LINK_LIBRARIES(Helmholtz3DHomo2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Helmholtz3DHomo2D)
SET(HDGHelmholtz1DSource HDGHelmholtz1D.cpp)
ADD_NEKTAR_EXECUTABLE(HDGHelmholtz1D demos HDGHelmholtz1DSource)
TARGET_LINK_LIBRARIES(HDGHelmholtz1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(HDGHelmholtz1D)
SET(HDGHelmholtz2DSource HDGHelmholtz2D.cpp)
ADD_NEKTAR_EXECUTABLE(HDGHelmholtz2D demos HDGHelmholtz2DSource)
TARGET_LINK_LIBRARIES(HDGHelmholtz2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(HDGHelmholtz2D)
SET(PostProcHDG2DSource PostProcHDG2D.cpp)
ADD_NEKTAR_EXECUTABLE(PostProcHDG2D demos PostProcHDG2DSource)
TARGET_LINK_LIBRARIES(PostProcHDG2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(PostProcHDG2D)
SET(HDGHelmholtz3DSource HDGHelmholtz3D.cpp)
ADD_NEKTAR_EXECUTABLE(HDGHelmholtz3D demos HDGHelmholtz3DSource)
TARGET_LINK_LIBRARIES(HDGHelmholtz3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(HDGHelmholtz3D)
SET(PostProcHDG3DSource PostProcHDG3D.cpp)
ADD_NEKTAR_EXECUTABLE(PostProcHDG3D demos PostProcHDG3DSource)
TARGET_LINK_LIBRARIES(PostProcHDG3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(PostProcHDG3D)
SET(HDGHelmholtz3DHomo1DSource HDGHelmholtz3DHomo1D.cpp)
ADD_NEKTAR_EXECUTABLE(HDGHelmholtz3DHomo1D demos HDGHelmholtz3DHomo1DSource)
TARGET_LINK_LIBRARIES(HDGHelmholtz3DHomo1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(HDGHelmholtz3DHomo1D)
SET(Deriv3DHomo1D_SingleModeSource Deriv3DHomo1D_SingleMode.cpp)
ADD_NEKTAR_EXECUTABLE(Deriv3DHomo1D_SingleMode demos Deriv3DHomo1D_SingleModeSource)
TARGET_LINK_LIBRARIES(Deriv3DHomo1D_SingleMode ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Deriv3DHomo1D_SingleMode)
SET(Deriv3DHomo1DSource Deriv3DHomo1D.cpp)
ADD_NEKTAR_EXECUTABLE(Deriv3DHomo1D demos Deriv3DHomo1DSource)
TARGET_LINK_LIBRARIES(Deriv3DHomo1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Deriv3DHomo1D)
SET(Deriv3DHomo2DSource Deriv3DHomo2D.cpp)
ADD_NEKTAR_EXECUTABLE(Deriv3DHomo2D demos Deriv3DHomo2DSource)
TARGET_LINK_LIBRARIES(Deriv3DHomo2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(Deriv3DHomo2D)
SET(SteadyAdvectionDiffusionReactionCont2DSource SteadyAdvectionDiffusionReaction2D.cpp)
ADD_NEKTAR_EXECUTABLE(SteadyAdvectionDiffusionReaction2D demos SteadyAdvectionDiffusionReactionCont2DSource)
TARGET_LINK_LIBRARIES(SteadyAdvectionDiffusionReaction2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(SteadyAdvectionDiffusionReaction2D)
# Generate list of available subdirectories
FILE(GLOB dir_list "*")
......
SET(LinkLibraries
optimized MultiRegions debug MultiRegions-g
optimized LocalRegions debug LocalRegions-g
optimized SpatialDomains debug SpatialDomains-g
optimized StdRegions debug StdRegions-g
optimized LibUtilities debug LibUtilities-g
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${ZLIB_LIBRARY_RELEASE} debug ${ZLIB_LIBRARY_DEBUG}
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET(LinkLibraries MultiRegions)
SET(ProjectLoc1DSource ProjectLoc1D.cpp)
ADD_NEKTAR_EXECUTABLE(ProjectLoc1D extra-demos ProjectLoc1DSource)
TARGET_LINK_LIBRARIES(ProjectLoc1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(ProjectLoc1D)
SET(ProjectCont1DSource ProjectCont1D.cpp)
ADD_NEKTAR_EXECUTABLE(ProjectCont1D extra-demos ProjectCont1DSource)
TARGET_LINK_LIBRARIES(ProjectCont1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(ProjectCont1D)
SET(ProjectLoc3DSource ProjectLoc3D.cpp)
ADD_NEKTAR_EXECUTABLE(ProjectLoc3D extra-demos ProjectLoc3DSource)
TARGET_LINK_LIBRARIES(ProjectLoc3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(ProjectLoc3D)
SET(ProjectCont3DSource ProjectCont3D.cpp)
ADD_NEKTAR_EXECUTABLE(ProjectCont3D extra-demos ProjectCont3DSource)
TARGET_LINK_LIBRARIES(ProjectCont3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(ProjectCont3D)
SET(ProjectContField3DSource ProjectContField3D.cpp)
ADD_NEKTAR_EXECUTABLE(ProjectContField3D extra-demos ProjectContField3DSource)
TARGET_LINK_LIBRARIES(ProjectContField3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(ProjectContField3D)
SET(ProjectLoc2DSource ProjectLoc2D.cpp)
ADD_NEKTAR_EXECUTABLE(ProjectLoc2D extra-demos ProjectLoc2DSource)
TARGET_LINK_LIBRARIES(ProjectLoc2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(ProjectLoc2D)
SET(ProjectCont2DSource ProjectCont2D.cpp)
ADD_NEKTAR_EXECUTABLE(ProjectCont2D extra-demos ProjectCont2DSource)
TARGET_LINK_LIBRARIES(ProjectCont2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(ProjectCont2D)
SET(SteadyLinearAdvectionReactionCont2DSource SteadyLinearAdvectionReaction2D.cpp)
ADD_NEKTAR_EXECUTABLE(SteadyLinearAdvectionReaction2D extra-demos SteadyLinearAdvectionReactionCont2DSource)
TARGET_LINK_LIBRARIES(SteadyLinearAdvectionReaction2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(SteadyLinearAdvectionReaction2D)
#SET(EigValsLinearAdvectionCont2DSource EigValsLinearAdvection2D.cpp)
#ADD_NEKTAR_EXECUTABLE(EigValsLinearAdvection2D EigValsLinearAdvectionCont2DSource)
......@@ -58,17 +40,3 @@ SET_LAPACK_LINK_LIBRARIES(SteadyLinearAdvectionReaction2D)
SET(PostProcessingSource PostProcessing.cpp)
ADD_NEKTAR_EXECUTABLE(PostProcessing extra-demos PostProcessingSource)
TARGET_LINK_LIBRARIES(PostProcessing ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(PostProcessing)
# Do not build these now as they conflict with library/Timings
#IF( NEKTAR_BUILD_TIMINGS )
# SET(TimingCGHelmSolve2DSource TimingCGHelmSolve2D.cpp)
# ADD_NEKTAR_EXECUTABLE(TimingCGHelmSolve2D TimingCGHelmSolve2DSource)
# TARGET_LINK_LIBRARIES(TimingCGHelmSolve2D ${LinkLibraries})
# SET_LAPACK_LINK_LIBRARIES(TimingCGHelmSolve2D)
#
# SET(TimingHDGHelmSolve2DSource TimingHDGHelmSolve2D.cpp)
# ADD_NEKTAR_EXECUTABLE(TimingHDGHelmSolve2D TimingHDGHelmSolve2DSource)
# TARGET_LINK_LIBRARIES(TimingHDGHelmSolve2D ${LinkLibraries})
# SET_LAPACK_LINK_LIBRARIES(TimingHDGHelmSolve2D)
#ENDIF( NEKTAR_BUILD_TIMINGS )
SET(LinkLibraries
optimized StdRegions debug StdRegions-g
optimized LibUtilities debug LibUtilities-g
optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
)
SET(LinkLibraries StdRegions)
SET(StdProject0DSource StdProject0D.cpp)
ADD_NEKTAR_EXECUTABLE(StdProject0D demos StdProject0DSource)
TARGET_LINK_LIBRARIES(StdProject0D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(StdProject0D)
SET(StdProject1DSource StdProject1D.cpp)
ADD_NEKTAR_EXECUTABLE(StdProject1D demos StdProject1DSource)
TARGET_LINK_LIBRARIES(StdProject1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(StdProject1D)
SET(StdProject_Diff1DSource StdProject_Diff1D.cpp)
ADD_NEKTAR_EXECUTABLE(StdProject_Diff1D demos StdProject_Diff1DSource)
TARGET_LINK_LIBRARIES(StdProject_Diff1D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(StdProject_Diff1D)
SET(StdProject2DSource StdProject2D.cpp)
ADD_NEKTAR_EXECUTABLE(StdProject2D demos StdProject2DSource)
TARGET_LINK_LIBRARIES(StdProject2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(StdProject2D)
SET(StdProject_Diff2DSource StdProject_Diff2D.cpp)
ADD_NEKTAR_EXECUTABLE(StdProject_Diff2D demos StdProject_Diff2DSource)
TARGET_LINK_LIBRARIES(StdProject_Diff2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(StdProject_Diff2D)
SET(StdProject3DSource StdProject3D.cpp)
ADD_NEKTAR_EXECUTABLE(StdProject3D demos StdProject3DSource)
TARGET_LINK_LIBRARIES(StdProject3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(StdProject3D)
SET(StdProject_Diff3DSource StdProject_Diff3D.cpp)
ADD_NEKTAR_EXECUTABLE(StdProject_Diff3D demos StdProject_Diff3DSource)
TARGET_LINK_LIBRARIES(StdProject_Diff3D ${LinkLibraries})