diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9408c6840b3efee30a0c3a838a6b6bdf38212c01..f73c6e020f1e63e6be7b49e45c01f7ae90fb8e7d 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 e9b33c18e665262bdfbfe3a32d377463e6e922ee..ebb6d6869f5f631c0716bb9e5ad4020005b8e8f9 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 bc056ea83a0659ccbf5e8469e7e9b85681c91b23..f68b8291db69bffecc16c5b317d46cf2914baac3 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 ### #############################################################