diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccfd2953469e0ba27fcd56cec612c612afa2f807..03708abfd493583db3bbf14cb9a9fde4b7e67594 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