From be4e74cc1c24c9bb93a36f34704969b5e65c7cc2 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Tue, 18 Nov 2025 17:17:13 +0100 Subject: [PATCH] [ci] Don't set `CMAKE_BUILD_RPATH` on macOS This was needed to find the Fortran libraries, but since 31613210d6 the RPATH is appended to in the CMake configuration code, so we don't need to pass "magic" CMAKE_* flags in the CI configuration on macOS anymore. --- .github/workflows/root-ci-config/buildconfig/mac-beta.txt | 1 - .github/workflows/root-ci-config/buildconfig/mac15.txt | 1 - .github/workflows/root-ci-config/buildconfig/mac26.txt | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt index 5568b7312b1c2..eb3e7a3358ce7 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt @@ -1,4 +1,3 @@ -CMAKE_BUILD_RPATH=/usr/local/lib CMAKE_CXX_STANDARD=23 builtin_cfitsio=ON builtin_cppzmq=ON diff --git a/.github/workflows/root-ci-config/buildconfig/mac15.txt b/.github/workflows/root-ci-config/buildconfig/mac15.txt index fa110b79efe18..f0328a71c0d5b 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac15.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac15.txt @@ -1,4 +1,3 @@ -CMAKE_BUILD_RPATH=/usr/local/lib builtin_cfitsio=ON builtin_cppzmq=ON builtin_davix=ON diff --git a/.github/workflows/root-ci-config/buildconfig/mac26.txt b/.github/workflows/root-ci-config/buildconfig/mac26.txt index 5568b7312b1c2..eb3e7a3358ce7 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac26.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac26.txt @@ -1,4 +1,3 @@ -CMAKE_BUILD_RPATH=/usr/local/lib CMAKE_CXX_STANDARD=23 builtin_cfitsio=ON builtin_cppzmq=ON