Commit fb916b1e authored by Lars Bilke's avatar Lars Bilke
Browse files

[ci] Removed OGS_USE_CONAN in lots of places.

parent 2155b251
......@@ -57,7 +57,6 @@
"cacheVariables": {
"OGS_USE_PYTHON": "OFF",
"BUILD_SHARED_LIBS": "ON",
"OGS_USE_CONAN": "OFF",
"OGS_USE_PETSC": "ON"
},
"environment": {
......@@ -178,7 +177,6 @@
"cacheVariables": {
"OGS_BUILD_UTILS": "OFF",
"OGS_USE_PYTHON": "OFF",
"OGS_USE_CONAN": "OFF",
"OGS_USE_POETRY": "OFF"
}
},
......@@ -187,7 +185,6 @@
"inherits": "release-all",
"cacheVariables": {
"OGS_USE_PYTHON": "OFF",
"OGS_USE_CONAN": "OFF",
"OGS_USE_POETRY": "OFF",
"OGS_USE_UNITY_BUILDS": "OFF"
}
......
......@@ -33,7 +33,7 @@ build docs:
- python /opt/lizard/lizard.py -EWordCount -x "./ThirdParty/*" -x "./Tests/*" || true # word-cloud
# build
- cd build
- cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DOGS_USE_CONAN=OFF -DOGS_USE_POETRY=OFF
- cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DOGS_USE_POETRY=OFF -DOGS_BUILD_PROCESSES=SteadyStateDiffusion
- cmake . --graphviz=cmake-dependencies.dot && dot -Tsvg cmake-dependencies.dot -o cmake-dependencies.svg
- cmake . -DOGS_BUILD_PROCESSES=SteadyStateDiffusion
- cmake --build . --target doc > >(tee make-docs.output)
......
......@@ -10,7 +10,7 @@ build linux frontend:
variables:
CCACHE_DIR: "/data/ogs/.ccache"
CMAKE_PRESET: release
CMAKE_ARGS: "-DOGS_USE_CONAN=OFF -DOGS_USE_PYTHON=OFF -DOGS_CPU_ARCHITECTURE=generic"
CMAKE_ARGS: "-DOGS_USE_PYTHON=OFF -DOGS_CPU_ARCHITECTURE=generic"
before_script:
- !reference [.template-build-linux, before_script]
- source scripts/env/eve/cli.sh
......@@ -8,10 +8,8 @@ build linux:
timeout: 2h
variables:
BUILD_CTEST_LARGE_ON_MASTER: "true"
CMAKE_PRESET: release
CMAKE_PRESET: release-all
CMAKE_ARGS: >-
-DOGS_USE_CONAN=OFF
-DOGS_USE_MFRONT=ON
-DOGS_$USE_PYTHON
-DOGS_INSTALL_DEPENDENCIES=ON
parallel:
......@@ -30,10 +28,8 @@ linux ctest large:
timeout: 2h
variables:
TARGETS: ctest-large
CMAKE_PRESET: release
CMAKE_PRESET: release-all
CMAKE_ARGS: >-
-DOGS_USE_CONAN=OFF
-DOGS_USE_MFRONT=ON
-DOGS_USE_PYTHON=ON
build linux (no unity):
......@@ -72,7 +68,6 @@ build linux arch:
CMAKE_PRESET: release-all
CMAKE_ARGS: >-
-DBUILD_SHARED_LIBS=ON
-DOGS_USE_CONAN=OFF
-DOGS_USE_POETRY=OFF
build linux ubuntu:
......@@ -84,5 +79,3 @@ build linux ubuntu:
needs: [meta]
variables:
CMAKE_PRESET: release-all
CMAKE_ARGS: >-
-DOGS_USE_CONAN=OFF
......@@ -6,7 +6,6 @@ build mac:
- .test-artifacts
needs: [meta]
variables:
BUILD_DIR: "mac-release"
CHECK_WARNINGS: "true"
CMAKE_PRESET: release
CMAKE_ARGS: >-
......
......@@ -7,13 +7,11 @@ build win:
- when: manual
allow_failure: true
variables:
BUILD_DIR: win-release
CHECK_WARNINGS: "true"
CMAKE_PRESET: release
CMAKE_ARGS: >-
-DOGS_CI_TESTRUNNER_REPEAT=1
-DOGS_$USE_PYTHON
-DOGS_USE_CONAN=AUTO
parallel:
matrix:
- USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]
if(NOT OGS_USE_CONAN OR (NOT OGS_USE_LIS AND NOT OGS_USE_NETCDF))
if(NOT OGS_USE_CONAN OR NOT OGS_USE_NETCDF)
return()
endif()
string(TOLOWER ${OGS_USE_CONAN} OGS_USE_CONAN_lower)
......
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