From ecca8f4a40964d4bbbc28cf2346041d5a223fd51 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 14 Jan 2021 15:21:55 +0100
Subject: [PATCH] Fix cmake issues.
---
.gitlab-ci.yml | 2 +-
gpu.cmake | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9419bcefd..884300448 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -254,7 +254,7 @@ gpu_numerical_tests:
- cd $CI_PROJECT_DIR/build
- rm -r -f ./*
- cmake ..
- -DBUILD_VF_CPU=ON
+ -DBUILD_VF_CPU=OFF
-DBUILD_VF_GPU=ON
-DBUILD_NUMERIC_TESTS=ON
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
diff --git a/gpu.cmake b/gpu.cmake
index bc2fab3fd..29fe0d826 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -10,13 +10,13 @@
#############################################################
-if(VF.BUILD_NUMERIC_TESTS)
+if(BUILD_NUMERIC_TESTS)
set(CMAKE_CXX_STANDARD 17)
endif()
#############################################################
-IF( VF.BUILD_VF_GKS )
+IF( BUILD_VF_GKS )
# only use this with device of CC larger than 6.0
set(CMAKE_CUDA_FLAGS "-Xptxas=\"-v\"" CACHE STRING "" FORCE)
set(CMAKE_CUDA_ARCHITECTURES 60)
@@ -43,7 +43,7 @@ add_subdirectory(src/gpu/GridGenerator)
### Virtual Fluids GPU ###
#############################################################
-IF (VF.BUILD_VF_GPU)
+IF (BUILD_VF_GPU)
add_subdirectory(src/gpu/VirtualFluids_GPU)
#add_subdirectory(targets/apps/LBM/lbmTest)
@@ -65,7 +65,7 @@ ENDIF()
#############################################################
-IF (VF.BUILD_VF_GKS)
+IF (BUILD_VF_GKS)
add_subdirectory(src/gpu/GksMeshAdapter)
add_subdirectory(src/gpu/GksVtkAdapter)
@@ -115,7 +115,7 @@ ENDIF()
#############################################################
### JSONCPP ###
#############################################################
-IF (NOT VF.BUILD_JSONCPP)
+IF (NOT BUILD_JSONCPP)
MESSAGE( STATUS "Build Input Project without JsonCpp." )
ELSE()
add_subdirectory(3rdParty/jsoncpp)
@@ -126,7 +126,7 @@ ENDIF()
### Numeric Tests ###
#############################################################
-if(VF.BUILD_NUMERIC_TESTS)
+if(BUILD_NUMERIC_TESTS)
# PATH_NUMERICAL_TESTS can be passed to cmake e.g. cmake .. -DPATH_NUMERICAL_TESTS=/data/
if(PATH_NUMERICAL_TESTS)
@@ -143,7 +143,7 @@ endif()
### Annas Traffic Sim ###
#############################################################
-if(VF.BUILD_VF_TRAFFIC)
+if(BUILD_VF_TRAFFIC)
add_subdirectory(src/gpu/Traffic)
add_subdirectory(apps/gpu/LBM/TrafficTest)
endif()
\ No newline at end of file
--
GitLab