diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f926b3f19e8c54d9ac493e2718b26c19d8a3378..bda9ae5079551c92bd3359798e0b3750459f16ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ 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_CONFIG_FLAGS} ${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 @@ -112,28 +112,28 @@ variables: # ACTUAL BUILD JOBS ### MACOS BUILD JOBS -mac-coin: - <<: *macos-job - <<: *coin-job - -mac-soqt: - <<: *macos-job - <<: *soqt-job - needs: ["mac-coin"] - -mac-geomodel-base: - <<: *macos-job - <<: *geomodel-job - stage: step-A - -mac-geomodel-visualization: - <<: *macos-job - <<: *geomodel-job - stage: step-C - needs: ["mac-coin", "mac-soqt"] - variables: - CMAKE_ARGS: ${CMAKE_BASE_ARGS} - CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE +# mac-coin: +# <<: *macos-job +# <<: *coin-job +# +# mac-soqt: +# <<: *macos-job +# <<: *soqt-job +# needs: ["mac-coin"] +# +# mac-geomodel-base: +# <<: *macos-job +# <<: *geomodel-job +# stage: step-A +# +# mac-geomodel-visualization: +# <<: *macos-job +# <<: *geomodel-job +# stage: step-C +# needs: ["mac-coin", "mac-soqt"] +# variables: +# CMAKE_ARGS: ${CMAKE_BASE_ARGS} +# CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE @@ -163,7 +163,8 @@ ubu-gm-visualization-builtin: stage: step-C variables: CMAKE_ARGS: ${CMAKE_BASE_ARGS} - CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE + CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE + CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE ubu-gm-examples-builtin: <<: *ubuntu-job