From 272a43395fb6cdde5cc4d39eaab81308a89ab481 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Fri, 3 Jul 2020 23:27:21 +0200
Subject: [PATCH] CI: add missing CMake flags to jobs.
---
.gitlab-ci.yml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa674c700..3fd63fdf2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,34 +165,38 @@ ubuntu-geomodel-visualization-builtinNlohmannXercesC:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
-ubuntu-geomodel-examples:
+ubuntu-geomodel-examples-builtinNlohmannXercesC:
<<: *ubuntu-job
<<: *geomodel-job
stage: step-A
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
- CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_EXAMPLES=TRUE
+ CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_EXAMPLES=TRUE
+ CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
-ubuntu-geomodel-examples-gmg4:
+ubuntu-geomodel-examples-gmg4-builtinNlohmannXercesC:
<<: *ubuntu-job
<<: *geomodel-job
stage: step-A
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
- CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_EXAMPLES_W_GEANT4=TRUE
+ CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_EXAMPLES_W_GEANT4=TRUE
+ CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
-ubuntu-geomodel-gmg4:
+ubuntu-geomodel-gmg4-builtinNlohmannXercesC:
<<: *ubuntu-job
<<: *geomodel-job
stage: step-A
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
- CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_GEOMODELG4=TRUE
+ CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_GEOMODELG4=TRUE
+ CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
-ubuntu-geomodel-fullsimlight:
+ubuntu-geomodel-fullsimlight-builtinNlohmannXercesC:
<<: *ubuntu-job
<<: *geomodel-job
stage: step-A
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
- CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
+ CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
+ CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
--
GitLab