From 990a999635b37d02f18f913215eb14e6f4457360 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 2 Feb 2021 14:27:35 +0100
Subject: [PATCH] [ci] CMake presets on Mac jobs.
---
scripts/ci/jobs/build-gui-mac.yml | 6 +-----
scripts/ci/jobs/build-mac.yml | 6 +++---
scripts/ci/jobs/checks.yml | 6 +++---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index b9a3f5da14b..ca76dd06216 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 1ae0f906a52..5c35c328fc9 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 26381758617..e02ffef696c 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
--
GitLab