Commit 2ddad2a9 authored by Matt Clarkson's avatar Matt Clarkson

Issue #1: Tidy up.

parent 8e79ed6e
Pipeline #4071 canceled with stages
in 9 minutes and 49 seconds
......@@ -33,7 +33,7 @@ linux build:
script:
- export src_dir=${CI_PROJECT_DIR}
- export git_hash=${CI_COMMIT_SHA:0:6}
- export git_hash=${CI_COMMIT_SHORT_SHA}
- export sb_dir="${CI_PROJECT_DIR}-sb"
- export pb_dir="${sb_dir}/SKSURGERYGPUCPP-build"
- echo "Sources - ${src_dir}"
......@@ -56,7 +56,6 @@ linux build:
-DSKSURGERYGPUCPP_USE_CUDA:BOOL=ON
-DSKSURGERYGPUCPP_CUDA_ARCH_BIN:STRING=61
${src_dir}
- make -j 1
linux test:
......@@ -111,27 +110,33 @@ windows build:
- shared-win
script:
- ${Env:srcdir} = ${CI_PROJECT_DIR}
- echo "Sources - ${Env:srcdir}"
- ${Env:githash} = ${CI_COMMIT_SHORT_SHA}
- echo "Commit - ${Env:githash}"
- ${Env:sbdir} = "C:\gitlab-runner\scikit-surgerygpucpp-sb"
- echo "Superbuild - ${Env:sbdir}"
- ${Env:src_dir} = ${CI_PROJECT_DIR}
- ${Env:git_hash} = ${CI_COMMIT_SHORT_SHA}
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-sb"
- ${Env:pb_dir} = "${Env:sb_dir}\SKSURGERYGPUCPP-build"
- echo "Sources - ${Env:src_dir}"
- echo "Commit - ${Env:git_hash}"
- echo "Superbuild - ${Env:sb_dir}"
- echo "Project build - ${pb_dir}"
- ${Env:PATH} = "C:\Program Files\CMake\bin;C:\Python36;C:\Python36\Scripts;${Env:PATH}"
- ${Env:GIT_SSL_NO_VERIFY} = 1
- if (Test-Path ${Env:sbdir}) { Remove-Item ${Env:sbdir} -Recurse; }
- mkdir ${Env:sbdir}
- cd ${Env:sbdir}
- pwd
- hostname
- whoami
- cmake -version
- cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SUPERBUILD:BOOL=ON -DBUILD_Boost:BOOL=ON -DBUILD_Python_Boost:BOOL=ON -DBUILD_OpenCV:BOOL=OFF -DBUILD_Eigen:BOOL=OFF -DBUILD_ArrayFire:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DSKSURGERYGPUCPP_USE_CUDA:BOOL=OFF -DSKSURGERYGPUCPP_CUDA_ARCH_BIN:STRING=30 --config "Release" ${Env:srcdir}
- if (Test-Path ${Env:sb_dir}) { Remove-Item ${Env:sb_dir} -Recurse; }
- mkdir ${Env:sb_dir}
- cd ${Env:sb_dir}
- cmake -version
- cmake -G "Visual Studio 15 2017 Win64"
-DCMAKE_BUILD_TYPE:STRING=Release
-DSKSURGERYGPUCPP_USE_CUDA:BOOL=OFF
-DSKSURGERYGPUCPP_CUDA_ARCH_BIN:STRING=61
--config "Release" ${Env:src_dir}
- if ($LastExitCode -ne 0) {throw $LastExitCode}
- cmake --build . --config Release
- if ($LastExitCode -ne 0) {throw $LastExitCode}
windows test:
stage: test
......
......@@ -168,7 +168,7 @@ if(NOT DEFINED BOOST_ROOT AND NOT SKSURGERYGPUCPP_USE_SYSTEM_Boost)
${_with_boost_libs}
# Use the option below to view the shell commands (for debugging)
#-d+4
-d 4
-d 0
variant=${_boost_variant}
link=${_boost_link}
${_boost_cxxflags}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment