diff --git a/CMakePresets.json b/CMakePresets.json index 04466bbae1b3c7fee484292bd3cafb1b0b4a1fbc..ea12dd6feb890cd4b5b9a948c823a3e3afc0f7bb 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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" } diff --git a/scripts/ci/jobs/build-docs.yml b/scripts/ci/jobs/build-docs.yml index a268fbbf7d4d3268ede168c7447e4425dd6fec9b..d773fe630cd25c56db4473a448c65c176ff5edbd 100644 --- a/scripts/ci/jobs/build-docs.yml +++ b/scripts/ci/jobs/build-docs.yml @@ -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) diff --git a/scripts/ci/jobs/build-linux-frontend.yml b/scripts/ci/jobs/build-linux-frontend.yml index ff068ee51937b4c353679121c268c4b102068f4d..97452aa7dd512e94a49422723c7cc71d597c7130 100644 --- a/scripts/ci/jobs/build-linux-frontend.yml +++ b/scripts/ci/jobs/build-linux-frontend.yml @@ -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 diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml index bf0e0f933ec1fc6140fb4d8fe462dc43fedfe390..7d362872127e8a00d459de4979196494f8d097c8 100644 --- a/scripts/ci/jobs/build-linux.yml +++ b/scripts/ci/jobs/build-linux.yml @@ -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 diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml index 5c46c156f61eb87cf62b412c3fc0a3e877027a7b..ddc9de0c07c355804aa8f5025e71703d187f36ba 100644 --- a/scripts/ci/jobs/build-mac.yml +++ b/scripts/ci/jobs/build-mac.yml @@ -6,7 +6,6 @@ build mac: - .test-artifacts needs: [meta] variables: - BUILD_DIR: "mac-release" CHECK_WARNINGS: "true" CMAKE_PRESET: release CMAKE_ARGS: >- diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml index ce3ca3d0946315016c64556da598dd5dbedf2354..fa6314ee51a083eca02473610a5dc44ff79b18a0 100644 --- a/scripts/ci/jobs/build-win.yml +++ b/scripts/ci/jobs/build-win.yml @@ -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"] diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 95b79c392ac3a9c1033b0637e841bb2d718be917..4f60c7a636a6bfd723cccd03d8d3f61eeff74c29 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -1,4 +1,4 @@ -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)