From 3afcb1b7e0b5684c4822a0fb0144787f420a9d2f Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 3 Sep 2020 10:02:03 +0200
Subject: [PATCH] CMake: rename the directory variables in a consistent way.

---
 CMake/CMakeCABMacros.cmake                    |  6 ++---
 CMake/CMakeSetCompilerFlags.cmake             |  6 ++---
 CMake/VirtualFluidsMacros.cmake               |  6 ++---
 CMake/cmake_config_files/TESLA01.config.cmake |  8 +++----
 CMakeLists.txt                                | 18 +++++++-------
 apps/cpu/IncludsList.cmake                    | 24 +++++++++----------
 apps/gpu/LBM/DrivenCavity/CMakeLists.txt      | 16 ++++++-------
 apps/gpu/LBM/TGV_3D/CMakeLists.txt            |  6 ++---
 apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt   |  6 ++---
 apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt |  6 ++---
 src/basics/CMakeLists.txt                     |  2 +-
 src/basics/Core/buildInfo.cmake               |  2 +-
 src/cpu/VirtualFluidsCore/CMakeLists.txt      | 18 +++++++-------
 src/cpu/VirtualFluidsCore/IncludsList.cmake   |  4 ++--
 src/gpu/GridGenerator/CMakeLists.txt          | 12 +++++-----
 src/gpu/Traffic/CMakeLists.txt                |  2 +-
 src/gpu/VirtualFluids_GPU/CMakeLists.txt      | 14 +++++------
 17 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/CMake/CMakeCABMacros.cmake b/CMake/CMakeCABMacros.cmake
index ee8c53912..32e8c1e0f 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 624246e02..7197caaa6 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 5b9050427..de563d28f 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 67bde2622..adebd6af0 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 ab37a4f3c..4219695ee 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 3ff27cd86..21cd47edd 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 6832561d9..986d3fabb 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 962907cdb..56d9ac4f1 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 a3a6c4566..24a7c8907 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 e4b1aa190..8e249d2a2 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 7b2023b80..3d5d423d5 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 91972c43d..bbad317e9 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 242205211..05e0d946a 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 d9afccbea..b2a5a2f22 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 9859a6620..92f83cc1b 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 e026bdd45..ce63e4a3c 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 01184d7a3..415d25354 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")
-- 
GitLab