From edfa0ba2599e468aef5f391a654eb24a368032aa Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Fri, 12 Mar 2021 13:01:15 +0100
Subject: [PATCH] Fix ctest buzild folder.
---
.gitlab-ci.yml | 4 ++--
setup.py | 3 ---
src/cpu/simulationconfig/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4774f9dcf..e9ca03cef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,7 @@ gcc_9_python:
cache:
key: "gcc_9-$CI_COMMIT_REF_SLUG"
paths:
- - $BUILD_FOLDER
+ - build
artifacts:
expire_in: 1 hrs
@@ -213,7 +213,7 @@ msvc_16_unit_tests:
script:
- cd $CI_PROJECT_DIR/build
- - ctest -C debug
+ - ctest -C Release
###############################################################################
gcc_9_python_bindings_test:
diff --git a/setup.py b/setup.py
index 1821701ee..6f4ff71b0 100644
--- a/setup.py
+++ b/setup.py
@@ -9,9 +9,6 @@ from setuptools.command.build_ext import build_ext
from distutils.version import LooseVersion
vf_cmake_args = [
- "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
- "-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache",
- "-DCMAKE_C_COMPILER_LAUNCHER=ccache",
"-DBUILD_VF_PYTHON_BINDINGS=ON",
"-DBUILD_VF_CPU:BOOL=ON",
"-DUSE_METIS=ON",
diff --git a/src/cpu/simulationconfig/CMakeLists.txt b/src/cpu/simulationconfig/CMakeLists.txt
index 939e6baf2..95ee969a0 100644
--- a/src/cpu/simulationconfig/CMakeLists.txt
+++ b/src/cpu/simulationconfig/CMakeLists.txt
@@ -3,6 +3,6 @@ project(simulationconfig)
vf_add_library(NAME simulationconfig PUBLIC_LINK VirtualFluidsCore basics muparser)
-set_target_properties(simulationconfig PROPERTIES CXX_STANDARD 14 POSITION_INDEPENDENT_CODE ON)
+set_target_properties(simulationconfig PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_include_directories(simulationconfig PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
--
GitLab