diff --git a/CMake/CMakeCABMacros.cmake b/CMake/CMakeCABMacros.cmake index ee8c539128fa26a25e4c7191ba32a1ef413270c7..32e8c1e0fba34debf5dddbce3e19788aa9c24d44 100644 --- a/CMake/CMakeCABMacros.cmake +++ b/CMake/CMakeCABMacros.cmake @@ -55,8 +55,8 @@ ENDIF() ############################################################################ # externe (ACHTUNG: die darin enthaltenen benoetigen teils noch macros die # hier im Anschluss folgen -INCLUDE("${CMAKE_PATH}/CMakeSetCompilerFlags.cmake") -INCLUDE("${CMAKE_PATH}/CMakeCompilerMacros.cmake") +INCLUDE("${VF_CMAKE_DIR}/CMakeSetCompilerFlags.cmake") +INCLUDE("${VF_CMAKE_DIR}/CMakeCompilerMacros.cmake") ################################################################ ### ADD_TARGET_PROPERTIES ### @@ -311,7 +311,7 @@ SET_CAB_COMPILER() CHECK_FOR_VARIABLE(CAB_MACHINE "machine name, e.g. ALTIX, ARWEN") LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_MACHINE_${CAB_MACHINE}) LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_MACHINE=${CAB_MACHINE}) -SET(CMAKE_CONFIG_FILE "${CMAKE_PATH}/cmake_config_files/${CAB_MACHINE}.config.cmake") +SET(CMAKE_CONFIG_FILE "${VF_CMAKE_DIR}/cmake_config_files/${CAB_MACHINE}.config.cmake") IF(NOT EXISTS ${CMAKE_CONFIG_FILE}) MESSAGE(FATAL_ERROR "${CMAKE_CONFIG_FILE} does not exists... maybe false CAB_MACHINE = ${CAB_MACHINE}") diff --git a/CMake/CMakeSetCompilerFlags.cmake b/CMake/CMakeSetCompilerFlags.cmake index 624246e026ce62dc149eae65caa01da6ff08be4b..7197caaa64838edbcfbd421af334dd29fe4362ba 100644 --- a/CMake/CMakeSetCompilerFlags.cmake +++ b/CMake/CMakeSetCompilerFlags.cmake @@ -38,8 +38,8 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type) ############################################################################################################### ## standard compiler flags ############################################################################################################### - ELSEIF( EXISTS "${CMAKE_PATH}/compilerflags/${CAB_COMPILER}.cmake" ) - INCLUDE( ${CMAKE_PATH}/compilerflags/${CAB_COMPILER}.cmake) + ELSEIF( EXISTS "${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake" ) + INCLUDE( ${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake) ############################################################################################################### ## unknown compiler ############################################################################################################### @@ -47,7 +47,7 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type) #MESSAGE(FATAL_ERROR "CAB_COMPILER=${CAB_COMPILER} seems to be a not supported compiler") #MESSAGE(WARNING "CAB_COMPILER=${CAB_COMPILER} seems to be a not supported compiler; set to generic") SET(CAB_COMPILER "gccGeneric") - INCLUDE( ${CMAKE_PATH}/compilerflags/${CAB_COMPILER}.cmake) + INCLUDE( ${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake) ENDIF() diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake index 5b9050427029c54eb30c2aacf028dfb8a405bfaf..de563d28fbbbc959f96f29fa69470dc74e713556 100644 --- a/CMake/VirtualFluidsMacros.cmake +++ b/CMake/VirtualFluidsMacros.cmake @@ -165,7 +165,7 @@ function(vf_add_library) target_include_directories(${library_name} PRIVATE ${CMAKE_BINARY_DIR}) target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}) + target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}) #status("... configuring target: ${library_name} (type=${ARG_BUILDTYPE}) done") @@ -215,10 +215,10 @@ function(vf_add_tests) # link tested library target_include_directories(${library_test_name} PRIVATE ${CMAKE_BINARY_DIR}) target_include_directories(${library_test_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_include_directories(${library_test_name} PRIVATE ${SOURCE_PATH}) + target_include_directories(${library_test_name} PRIVATE ${VF_SRC_DIR}) # link googlemock - include(${CMAKE_PATH}/3rd/gmock.cmake) + include(${VF_CMAKE_DIR}/3rd/gmock.cmake) endfunction() diff --git a/CMake/cmake_config_files/TESLA01.config.cmake b/CMake/cmake_config_files/TESLA01.config.cmake index 67bde26227cffb5b4e8ea31b53abc438891de433..adebd6af01a6fbe44952cdf39f398aa9d7abb49d 100644 --- a/CMake/cmake_config_files/TESLA01.config.cmake +++ b/CMake/cmake_config_files/TESLA01.config.cmake @@ -1,8 +1,8 @@ #Don't change: -SET(METIS_ROOT ${THIRD_PATH}/metis/metis-5.1.0 CACHE PATH "METIS ROOT") -SET(GMOCK_ROOT ${THIRD_PATH}/googletest CACHE PATH "GMOCK ROOT") -SET(JSONCPP_ROOT ${THIRD_PATH}/jsoncpp CACHE PATH "JSONCPP ROOT") -SET(FFTW_ROOT ${THIRD_PATH}/fftw/fftw-3.3.7 CACHE PATH "JSONCPP ROOT") +SET(METIS_ROOT ${VF_THIRD_DIR}/metis/metis-5.1.0 CACHE PATH "METIS ROOT") +SET(GMOCK_ROOT ${VF_THIRD_DIR}/googletest CACHE PATH "GMOCK ROOT") +SET(JSONCPP_ROOT ${VF_THIRD_DIR}/jsoncpp CACHE PATH "JSONCPP ROOT") +SET(FFTW_ROOT ${VF_THIRD_DIR}/fftw/fftw-3.3.7 CACHE PATH "JSONCPP ROOT") #SET TO CORRECT PATH: diff --git a/CMakeLists.txt b/CMakeLists.txt index ab37a4f3c82aa9fae7ec632eb3a55fe90ad39000..4219695ee306e8fc48c8ac210521a36a460d203b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,10 +22,10 @@ set(testFolder "tests") set(appFolder "apps") set(thirdFolder "3rd") -set (CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake) -set (THIRD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty) -set (SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src) -set (VF_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set (VF_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMake) +set (VF_THIRD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty) +set (VF_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (VF_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) ################################################################################# # OPTIONS @@ -50,11 +50,11 @@ endif() # MACROS ################################################################################# include(CMakePrintHelpers) -include(${CMAKE_PATH}/CMakeCABMacros.cmake) -include(${CMAKE_PATH}/FileUtilities.cmake) -include(${CMAKE_PATH}/VirtualFluidsMacros.cmake) +include(${VF_CMAKE_DIR}/CMakeCABMacros.cmake) +include(${VF_CMAKE_DIR}/FileUtilities.cmake) +include(${VF_CMAKE_DIR}/VirtualFluidsMacros.cmake) -include(${CMAKE_PATH}/CMakeMacros_old/general/FindCompiler.cmake) +include(${VF_CMAKE_DIR}/CMakeMacros_old/general/FindCompiler.cmake) configure_file(src/basics/VirtualFluidsDefinitions.in.h ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h) ################################################################################# @@ -76,5 +76,5 @@ endif() # 3rd Party Libraries ################################################################################# if(BUILD_VF_UNIT_TESTS) - add_subdirectory(${THIRD_PATH}/googletest) + add_subdirectory(${VF_THIRD_DIR}/googletest) endif() diff --git a/apps/cpu/IncludsList.cmake b/apps/cpu/IncludsList.cmake index 3ff27cd865cf48aa1729f1426b5d661de8f39d31..21cd47eddb5ca7d182a53c7ee01f97ea991aa02e 100644 --- a/apps/cpu/IncludsList.cmake +++ b/apps/cpu/IncludsList.cmake @@ -1,14 +1,14 @@ INCLUDE_DIRECTORIES(${APPS_ROOT_CPU}) -INCLUDE(${SOURCE_PATH}/cpu/VirtualFluidsCore/IncludsList.cmake) +INCLUDE(${VF_SRC_DIR}/cpu/VirtualFluidsCore/IncludsList.cmake) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/cpu/VirtualFluidsCore) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/geometry3d) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/geometry3d/Creator) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/geometry3d/KdTree) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/basics/container) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/basics/memory) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/basics/objects) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/basics/transmiitter) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/basics/utilities) -INCLUDE_DIRECTORIES(${SOURCE_PATH}/basics/basics/writer) \ No newline at end of file +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/cpu/VirtualFluidsCore) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/geometry3d) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/geometry3d/Creator) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/geometry3d/KdTree) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/basics/container) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/basics/memory) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/basics/objects) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/basics/transmiitter) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/basics/utilities) +INCLUDE_DIRECTORIES(${VF_SRC_DIR}/basics/basics/writer) \ No newline at end of file diff --git a/apps/gpu/LBM/DrivenCavity/CMakeLists.txt b/apps/gpu/LBM/DrivenCavity/CMakeLists.txt index 6832561d91b8a408813594c431f69c355664b2e8..986d3fabbc8352666bc3a6fba25a27ba89522129 100644 --- a/apps/gpu/LBM/DrivenCavity/CMakeLists.txt +++ b/apps/gpu/LBM/DrivenCavity/CMakeLists.txt @@ -4,14 +4,14 @@ PROJECT(DrivenCavity) vf_add_library(BUILDTYPE binary DEPENDS VirtualFluids_GPU basics GridGenerator FILES DrivenCavity.cpp ) -include (${CMAKE_PATH}/3rd/cuda.cmake) -include (${CMAKE_PATH}/3rd/mpi.cmake) -include (${CMAKE_PATH}/3rd/boost.cmake) +include (${VF_CMAKE_DIR}/3rd/cuda.cmake) +include (${VF_CMAKE_DIR}/3rd/mpi.cmake) +include (${VF_CMAKE_DIR}/3rd/boost.cmake) linkBoost ("serialization") vf_get_library_name(library_name) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/gpu) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/gpu/VirtualFluids_GPU) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/gpu/GridGenerator) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/Core) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu/VirtualFluids_GPU) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu/GridGenerator) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/Core) diff --git a/apps/gpu/LBM/TGV_3D/CMakeLists.txt b/apps/gpu/LBM/TGV_3D/CMakeLists.txt index 962907cdbc8b0bdd29ab6f9fffaa14f00b14ef41..56d9ac4f1281b03b3de4a023853619f0f5df4a14 100644 --- a/apps/gpu/LBM/TGV_3D/CMakeLists.txt +++ b/apps/gpu/LBM/TGV_3D/CMakeLists.txt @@ -2,9 +2,9 @@ PROJECT(TGV_3D) vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES TGV_3D.cpp) -include (${CMAKE_PATH}/3rd/cuda.cmake) -include (${CMAKE_PATH}/3rd/mpi.cmake) -include (${CMAKE_PATH}/3rd/boost.cmake) +include (${VF_CMAKE_DIR}/3rd/cuda.cmake) +include (${VF_CMAKE_DIR}/3rd/mpi.cmake) +include (${VF_CMAKE_DIR}/3rd/boost.cmake) linkBoost ("serialization") vf_get_library_name(library_name) diff --git a/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt b/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt index a3a6c4566e5ca3d4e0f93b1285961bfb26b06d34..24a7c8907fc7c2fd31b02ef868642584f647a32e 100644 --- a/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt +++ b/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt @@ -2,9 +2,9 @@ PROJECT(TGV_3D_MultiGPU) vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES TGV_3D_MultiGPU.cpp) -include (${CMAKE_PATH}/3rd/cuda.cmake) -include (${CMAKE_PATH}/3rd/mpi.cmake) -include (${CMAKE_PATH}/3rd/boost.cmake) +include (${VF_CMAKE_DIR}/3rd/cuda.cmake) +include (${VF_CMAKE_DIR}/3rd/mpi.cmake) +include (${VF_CMAKE_DIR}/3rd/boost.cmake) linkBoost ("serialization") vf_get_library_name(library_name) diff --git a/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt b/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt index e4b1aa19095d5d712601852989372c582782e195..8e249d2a21604bf501dc0c75bf9f7190d4a154ad 100644 --- a/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt +++ b/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt @@ -2,9 +2,9 @@ PROJECT(GridGeneratorTest) vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES gridGenerator.cpp) -include (${CMAKE_PATH}/3rd/cuda.cmake) -include (${CMAKE_PATH}/3rd/mpi.cmake) -include (${CMAKE_PATH}/3rd/boost.cmake) +include (${VF_CMAKE_DIR}/3rd/cuda.cmake) +include (${VF_CMAKE_DIR}/3rd/mpi.cmake) +include (${VF_CMAKE_DIR}/3rd/boost.cmake) linkBoost ("serialization") vf_get_library_name(library_name) diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt index 7b2023b80dee73ed399cdd17a493a3fba05eaec2..3d5d423d520ac9a31d4c224df97c6f1779188c7c 100644 --- a/src/basics/CMakeLists.txt +++ b/src/basics/CMakeLists.txt @@ -18,6 +18,6 @@ IF(MSVC) target_compile_definitions(${library_name} PUBLIC NOMINMAX) # Disable Min/Max-Macros ENDIF(MSVC) -include (${CMAKE_PATH}/3rd/mpi.cmake) +include (${VF_CMAKE_DIR}/3rd/mpi.cmake) vf_add_tests() \ No newline at end of file diff --git a/src/basics/Core/buildInfo.cmake b/src/basics/Core/buildInfo.cmake index 91972c43d54037beb194b7c8a30c3aca43784edb..bbad317e989f670e05eb663a74123343035daa63 100644 --- a/src/basics/Core/buildInfo.cmake +++ b/src/basics/Core/buildInfo.cmake @@ -2,7 +2,7 @@ set(buildInfoPath ${CMAKE_BINARY_DIR}/buildInfo) set(buildInfoFile buildInfo.cpp) set(buildInfoInput ${CMAKE_CURRENT_LIST_DIR}/buildInfo.in.cpp) -include(${CMAKE_PATH}/3rd/git/GetGitRevisionDescription.cmake) +include(${VF_CMAKE_DIR}/3rd/git/GetGitRevisionDescription.cmake) get_git_head_revision(git_branch git_commit_hash) set(COMPILER_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}} ${CMAKE_CXX_FLAGS}") diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt index 242205211c45b7c7b731e101c4e151f260aff9bf..05e0d946afbfc0fcef1aef23c2270e2e06d2adba 100644 --- a/src/cpu/VirtualFluidsCore/CMakeLists.txt +++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt @@ -67,12 +67,12 @@ INCLUDE(${CMAKE_CURRENT_LIST_DIR}/IncludsList.cmake) vf_add_library(BUILDTYPE static DEPENDS basics MuParser ${MPI_LIBRARY} ${CAB_ADDITIONAL_LINK_LIBRARIES}) vf_get_library_name(library_name) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/geometry3d) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/geometry3d/KdTree) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/basics/container) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/basics/memory) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/basics/objects) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/basics/transmitter) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/basics/utilities) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/basics/writer) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/geometry3d) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/geometry3d/KdTree) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/basics/container) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/basics/memory) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/basics/objects) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/basics/transmitter) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/basics/utilities) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/basics/writer) diff --git a/src/cpu/VirtualFluidsCore/IncludsList.cmake b/src/cpu/VirtualFluidsCore/IncludsList.cmake index d9afccbea65a9a4bac930530bec84247f5c8bf8d..b2a5a2f223c2b7a015cc36855d8455ef3a64f192 100644 --- a/src/cpu/VirtualFluidsCore/IncludsList.cmake +++ b/src/cpu/VirtualFluidsCore/IncludsList.cmake @@ -1,4 +1,4 @@ -set(VirtualFluidsCore_source_dir ${SOURCE_PATH}/cpu/VirtualFluidsCore) +set(VirtualFluidsCore_source_dir ${VF_SRC_DIR}/cpu/VirtualFluidsCore) vf_get_library_name(library_name) INCLUDE_DIRECTORIES(${VirtualFluidsCore_source_dir}/BoundaryConditions) @@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${VirtualFluidsCore_source_dir}/Visitors) INCLUDE_DIRECTORIES(${VirtualFluidsCore_source_dir}/CoProcessors) INCLUDE_DIRECTORIES(${VirtualFluidsCore_source_dir}/Utilities) -INCLUDE_DIRECTORIES(${THIRD_PATH}) +INCLUDE_DIRECTORIES(${VF_THIRD_DIR}) IF(${USE_BOOST}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) diff --git a/src/gpu/GridGenerator/CMakeLists.txt b/src/gpu/GridGenerator/CMakeLists.txt index 9859a66207b3c14ed7d81e26de366bc74c3f85cf..92f83cc1b27bbb7c130e24c55042ed6f27a841ec 100644 --- a/src/gpu/GridGenerator/CMakeLists.txt +++ b/src/gpu/GridGenerator/CMakeLists.txt @@ -2,14 +2,14 @@ vf_add_library(BUILDTYPE shared DEPENDS basics) -include (${CMAKE_PATH}/3rd/cuda.cmake) -include (${CMAKE_PATH}/3rd/OpenMP.cmake) +include (${VF_CMAKE_DIR}/3rd/cuda.cmake) +include (${VF_CMAKE_DIR}/3rd/OpenMP.cmake) vf_get_library_name(library_name) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/geometry3d) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/gpu) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/Core) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/geometry3d) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/Core) set_property(TARGET ${library_name} PROPERTY CUDA_SEPARABLE_COMPILATION ON) \ No newline at end of file diff --git a/src/gpu/Traffic/CMakeLists.txt b/src/gpu/Traffic/CMakeLists.txt index e026bdd459642243f9c309e816fecad9ea86c00a..ce63e4a3cb2120d68c07b9dff4de55aca8b0b2ec 100644 --- a/src/gpu/Traffic/CMakeLists.txt +++ b/src/gpu/Traffic/CMakeLists.txt @@ -2,7 +2,7 @@ vf_add_library(BUILDTYPE shared DEPENDS GridGenerator basics) -include (${CMAKE_PATH}/3rd/cuda.cmake) +include (${VF_CMAKE_DIR}/3rd/cuda.cmake) vf_get_library_name(library_name) target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/basics") diff --git a/src/gpu/VirtualFluids_GPU/CMakeLists.txt b/src/gpu/VirtualFluids_GPU/CMakeLists.txt index 01184d7a3866cb6a36e23ae095769868dc117011..415d25354d366218a588427d8e50b9099606a7b1 100644 --- a/src/gpu/VirtualFluids_GPU/CMakeLists.txt +++ b/src/gpu/VirtualFluids_GPU/CMakeLists.txt @@ -9,16 +9,16 @@ ENDIF(MSVC) vf_add_library(BUILDTYPE shared DEPENDS ${libsToLink}) -include (${CMAKE_PATH}/3rd/cuda.cmake) -include (${CMAKE_PATH}/3rd/mpi.cmake) -include (${CMAKE_PATH}/3rd/boost.cmake) +include (${VF_CMAKE_DIR}/3rd/cuda.cmake) +include (${VF_CMAKE_DIR}/3rd/mpi.cmake) +include (${VF_CMAKE_DIR}/3rd/boost.cmake) linkBoost ("serialization") vf_get_library_name(library_name) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/gpu) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/gpu/GridGenerator) -target_include_directories(${library_name} PRIVATE ${SOURCE_PATH}/basics/Core) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu/GridGenerator) +target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/basics/Core) #SET(TPN_WIN32 "/EHsc")