From 9d854114ea9675cdef112dfc2920c9dbbbc3d00c Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 29 Jul 2026 19:51:52 -0400 Subject: [PATCH] Use Ninja as the generator for CMake on FreeBSD --- .github/scripts/install-deps.sh | 2 +- .github/workflows/testing.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/install-deps.sh b/.github/scripts/install-deps.sh index b8a9a025..a342fdbe 100755 --- a/.github/scripts/install-deps.sh +++ b/.github/scripts/install-deps.sh @@ -59,7 +59,7 @@ case "${OS%%-*}" in ;; freebsd) # GNU `gmake` and `gcc` are dependencies for most repos built by our external tests. - pkg install -y bash bison cmake git png gmake lang/gcc python3 py312-pillow + pkg install -y bash bison cmake ninja git png gmake lang/gcc python3 py312-pillow ;; windows) # GitHub Actions' hosted runners ship CMake 3.x, but versions prior to 4.0.0 ignore `CPACK_PACKAGE_FILE_NAME`. diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index c5ea91cb..b8612d7f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -399,8 +399,8 @@ jobs: prepare: | .github/scripts/install-deps.sh freebsd run: | # Leak detection is not supported on FreeBSD, so disable it. - cmake -B build --preset develop - cmake --build build --verbose -- -k -j "$(getconf _NPROCESSORS_ONLN)" + cmake -B build -G Ninja --preset develop + cmake --build build -- -k 0 . .github/scripts/freebsd-env.sh ASAN_OPTIONS=detect_leaks=0 ctest --test-dir build --schedule-random cmake --install build --verbose