From 747da7e862e5254bc7ff5378bdb8808af818aa39 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Wed, 1 Jul 2020 21:30:29 +0200
Subject: [PATCH] CI: test explicit cmake args
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccfd29534..03708abfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,7 +94,8 @@ variables:
- cd build
- echo "CMAKE_ARGS - ${CMAKE_ARGS}"
- echo "CMAKE_EXTRA_FLAGS - ${CMAKE_EXTRA_FLAGS}"
- - cmake ${CMAKE_ARGS} ${CMAKE_EXTRA_FLAGS} ..
+ # - cmake ${CMAKE_ARGS} ${CMAKE_EXTRA_FLAGS} ..
+ - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../dependencies-install -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE ..
- cmake --build . -- -j2 # using too many threads will cause weird compilation errors on the Ubuntu docker images...
- cmake --build . -- install
- pwd; ls # CI debug only
@@ -159,6 +160,6 @@ ubuntu-geomodeL-visualization-builtinNlohmannXercesC:
<<: *geomodel-job
needs: ["ubuntu-coin", "ubuntu-soqt"]
stage: step-C
- variables:
- CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=./dependencies-install
- CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
+ # variables:
+ # CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../dependencies-install
+ # CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
--
GitLab