From 3dcd4367473ed0c3cee013a2866bc08ab467f20b Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 29 Oct 2020 14:57:06 +0100
Subject: [PATCH] Add Build Job to windows. Remove unused Project command in
cpu.cmake and gpu.cmake
---
.gitlab-ci.yml | 3 ++-
cpu.cmake | 2 --
gpu.cmake | 7 -------
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9408c6840..f73c6e020 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -305,7 +305,8 @@ windows:
- mkdir build
- cd build
- cmake .. -DBUILD_VF_CPU=OFF -DBUILD_VF_GPU=ON -DBUILD_VF_UNIT_TESTS=ON -G "$CMAKE_GENERATOR" ..
- #- MSBuild.exe walberla.sln /property:Configuration=$BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
+ - MSBuild.exe VirtualFluids.sln /property:Configuration=$BUILD_CONFIGURATION /verbosity:normal /maxcpucount:4
variables:
CMAKE_GENERATOR: "Visual Studio 16 2019"
+ BUILD_CONFIGURATION: "Release"
diff --git a/cpu.cmake b/cpu.cmake
index e9b33c18e..ebb6d6869 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -17,8 +17,6 @@
#set(CMAKE_C_COMPILER mpicc)
#set(CMAKE_CXX_COMPILER mpiCC)
-PROJECT(VirtualFluids)
-
#debug build for unix
#IF(UNIX)
#SET(CMAKE_BUILD_TYPE DEBUG)
diff --git a/gpu.cmake b/gpu.cmake
index bc056ea83..f68b8291d 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -7,13 +7,6 @@
#SET(CUDA_CUT_INCLUDE_DIR "/cluster/cuda/9.0/include;/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
#SET(CUDA_SAMPLE_INCLUDE_DIR "/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
-#############################################################
-### PROJECT SETTINGS ###
-#############################################################
-
-project(VirtualFluidsGPU)
-
-
#############################################################
### OPTIONS ###
#############################################################
--
GitLab