Skip to content
Snippets Groups Projects
Commit 85fd579e authored by Soeren Peters's avatar Soeren Peters
Browse files

Merge pull request 'feature/windows10VM' (#57) from...

Merge pull request 'feature/windows10VM' (#57) from peters/VirtualFluids_dev:feature/windows10VM into develop

Reviewed-on: https://git.irmb.bau.tu-bs.de/VirtualFluids/VirtualFluids_dev/pulls/57
parents 51d92c0d 8804eba6
No related branches found
No related tags found
No related merge requests found
......@@ -244,7 +244,7 @@ gcov:
- export NVCUDASAMPLES_ROOT=$(pwd)/cuda-samples-10.1.2
script:
- mkdir $CI_PROJECT_DIR/gcov_build
- mkdir -p $CI_PROJECT_DIR/gcov_build
- cd $CI_PROJECT_DIR/gcov_build
- cmake .. -DBUILD_VF_CPU=ON -DBUILD_VF_GPU=ON -DBUILD_VF_COVERAGE=ON -DBUILD_VF_UNIT_TESTS=ON
- make -j4
......@@ -283,4 +283,36 @@ deploy_gcov_to_elladan:
- pip3 install ansible
script:
- ansible-playbook -i ansible/hosts.cfg -u public_pages ansible/playbook_gcov.yml
\ No newline at end of file
- ansible-playbook -i ansible/hosts.cfg -u public_pages ansible/playbook_gcov.yml
# windows
windows:
stage: build
tags:
- windows10
before_script:
- git --version
- $env:Path += ";C:\Program Files\CMake\bin\"
- cmake --version
- $env:Path += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin"
- MSBuild.exe -version
script:
- cd $CI_PROJECT_DIR
- md -force build
- cd build
- cmake .. -DBUILD_VF_CPU=OFF -DBUILD_VF_GPU=ON -DBUILD_VF_UNIT_TESTS=ON -G "$env:CMAKE_GENERATOR" ..
- MSBuild.exe VirtualFluids.sln /property:Configuration=$env:BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
- . ".\bin\$env:BUILD_CONFIGURATION\basicsTests.exe"
variables:
CMAKE_GENERATOR: "Visual Studio 16 2019"
BUILD_CONFIGURATION: "Release"
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-windows"
paths:
- $CI_PROJECT_DIR/build/
......@@ -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)
......
......@@ -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 ###
#############################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment