From a78a268cb4b025e77409d76d8515df174239bd57 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Tue, 14 Apr 2026 16:34:36 +0200 Subject: [PATCH] Pass convenience options to Make invoked via CMake Can't pass them to plain Make invocations, because we try to be compatible with macOS' old Make. --- .github/workflows/create-release-artifacts.yml | 2 +- .github/workflows/testing.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-release-artifacts.yml b/.github/workflows/create-release-artifacts.yml index bc58456f..5cfa8d34 100644 --- a/.github/workflows/create-release-artifacts.yml +++ b/.github/workflows/create-release-artifacts.yml @@ -61,7 +61,7 @@ jobs: - name: Build binaries run: | cmake -S . -B build --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" - cmake --build build + cmake --build build -- --output-sync --keep-going strip rgb{asm,link,fix,gfx} env: LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld. diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 01c31e85..95b99832 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -64,7 +64,7 @@ jobs: # better applied here than in our CMakeLists, where it could affect and break someone else. run: | cmake -S . -B build --preset develop -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }} - cmake --build build --verbose + cmake --build build --verbose -- --output-sync --keep-going sudo cmake --install build --verbose - name: Package binaries run: | @@ -123,7 +123,7 @@ jobs: - name: Build & install run: | cmake -S . -B build --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=macos - cmake --build build + cmake --build build -- --output-sync --keep-going env: LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld. - name: Package binaries @@ -371,6 +371,6 @@ jobs: .github/scripts/install_deps.sh freebsd run: | # Leak detection is not supported on FreeBSD, so disable it. cmake -S . -B build --preset develop -DTESTS_OS_NAME=freebsd - cmake --build build --verbose + cmake --build build --verbose -- -k ASAN_OPTIONS=detect_leaks=0 ctest --test-dir build --schedule-random --label-exclude external cmake --install build --verbose