diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml index b9a3f5da14bdb03b039bdc77f946ed2b1148319c..ca76dd06216502b1b8f971672ef33c8917d3282f 100644 --- a/scripts/ci/jobs/build-gui-mac.yml +++ b/scripts/ci/jobs/build-gui-mac.yml @@ -9,11 +9,7 @@ build gui mac: - when: manual allow_failure: true variables: - BUILD_DIR: "build-gui-mac" + CMAKE_PRESET: release-gui CMAKE_ARGS: >- -DOGS_USE_CONAN=auto - -DOGS_BUILD_CLI=OFF - -DOGS_BUILD_GUI=ON - -DOGS_BUILD_UTILS=ON - -DOGS_USE_NETCDF=OFF -DOGS_INSTALL_DEPENDENCIES=ON diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml index 1ae0f906a52f023ea3df3f10654a806e48d59f9c..5c35c328fc9b7984f7299bf63ed1058a5b9cfc1d 100644 --- a/scripts/ci/jobs/build-mac.yml +++ b/scripts/ci/jobs/build-mac.yml @@ -3,9 +3,9 @@ build mac: tags: - mac variables: - BUILD_DIR: "build-mac" + BUILD_DIR: "build/mac-release" + CMAKE_PRESET: release CMAKE_ARGS: >- - -DOGS_BUILD_UTILS=ON - -DOGS_USE_PYTHON=ON -DOGS_INSTALL_DEPENDENCIES=ON -DOGS_USE_XDMF=ON + -B $BUILD_DIR diff --git a/scripts/ci/jobs/checks.yml b/scripts/ci/jobs/checks.yml index 26381758617dc6783d87a436c040309d3e0f5884..e02ffef696c6595b222dae11e283f7847b1b9c0b 100644 --- a/scripts/ci/jobs/checks.yml +++ b/scripts/ci/jobs/checks.yml @@ -10,10 +10,10 @@ compiler warnings: - job: build mac script: - exit_code=0 - - cd build-no-unity + - cd build/no-unity - "if [[ $(cat make.output | grep warning -i) ]]; then printf 'There were GCC compiler warnings:\n\n'; cat make.output | grep warning -i; exit_code=1; fi" - - cd ../build-win + - cd ../win-release - "if [[ $(cat make.output | grep ': warning' -i) ]]; then printf 'There were MSVC compiler warnings:\n\n'; cat make.output | grep ': warning' -i; exit_code=1; fi" - - cd ../build-mac + - cd ../mac-release - "if [[ $(cat make.output | grep warning -i) ]]; then printf 'There were Clang (macOS) compiler warnings:\n\n'; cat make.output | grep warning -i; exit_code=1; fi" - exit $exit_code