diff --git a/.github/workflows/msvc-code-analysis.yml b/.github/workflows/msvc-code-analysis.yml index 66b47d479f37b1653fe20916122df16dca79ea88..3892838112f088c2672a233544d2c8f85b5b7ff4 100644 --- a/.github/workflows/msvc-code-analysis.yml +++ b/.github/workflows/msvc-code-analysis.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v2 - name: Configure CMake - run: cmake -B ${{ env.build }} -DCMAKE_BUILD_TYPE=${{ env.config }} -DOGS_BUILD_PROCESS_TH2M=OFF -DOGS_USE_UNITY_BUILDS=OFF -DOGS_BUILD_TESTING=OFF -DOGS_ENABLE_ELEMENT_PRISM=OFF -DOGS_ENABLE_ELEMENT_PYRAMID=OFF -DOGS_MAX_ELEMENT_DIM=2 + run: cmake -B ${{ env.build }} -DCMAKE_BUILD_TYPE=${{ env.config }} -DOGS_USE_UNITY_BUILDS=OFF -DOGS_BUILD_TESTING=OFF -DOGS_ENABLE_ELEMENT_PRISM=OFF -DOGS_ENABLE_ELEMENT_PYRAMID=OFF -DOGS_MAX_ELEMENT_DIM=2 # Build is not required unless generated source files are used # - name: Build CMake diff --git a/pyproject.toml b/pyproject.toml index 8f0af55e70c285ed43e2ab86e71f54bd9a864ed0..113abb2a11c0c7dd47ae36e8dc57e13d84ee880f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,7 +78,6 @@ environment-pass = [ # maybe this should be moved to CMake logic, i.e. disabling both features on win [tool.cibuildwheel.windows.config-settings] "cmake.define.OGS_USE_MFRONT" = "OFF" -"cmake.define.OGS_BUILD_PROCESS_TH2M" = "OFF" # Generator needs to be set here, CMAKE_GENERATOR env var does not work. # Ninja generator does not select the host64 compiler. "cmake.args" = "-G;Visual Studio 16 2019;--preset;wheel" diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml index 84ea090a82c2ceb4a4c18614bbe237b5fa68897a..5a8e2b4ded0a46a8e0e970869f65bff204b034b5 100644 --- a/scripts/ci/jobs/build-gui-win.yml +++ b/scripts/ci/jobs/build-gui-win.yml @@ -5,7 +5,7 @@ build gui win: rules: - if: '$CI_COMMIT_BRANCH == "master"' variables: - ADDITIONAL_CMAKE_ARGS: " -DOGS_BUILD_CLI=ON -DOGS_BUILD_PROCESS_TH2M=OFF" + ADDITIONAL_CMAKE_ARGS: " -DOGS_BUILD_CLI=ON" BUILD_TESTS: "false" BUILD_CTEST: "false" - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/ diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml index c4e687de1c61ad97a7ed14f3f0851ebb433baef1..772a55de8b0918caa37d54baf62480682cde499d 100644 --- a/scripts/ci/jobs/build-win.yml +++ b/scripts/ci/jobs/build-win.yml @@ -5,10 +5,8 @@ build win: variables: CHECK_WARNINGS: "true" CMAKE_PRESET: release - # TODO: temporary switched off TH2M CMAKE_ARGS: >- -DOGS_CI_TESTRUNNER_REPEAT=1 - -DOGS_BUILD_PROCESS_TH2M=OFF -DOGS_USE_PIP=ON -DOGS_USE_MKL=ON