diff --git a/CMakePresets.json b/CMakePresets.json index 2e1fe5f6..056a32b9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -227,14 +227,7 @@ { "name": "macos-clang18-base", "inherits": "macos-base", - "hidden": true, - "environment": { - "CC": "/opt/homebrew/opt/llvm@18/bin/clang", - "CXX": "/opt/homebrew/opt/llvm@18/bin/clang++", - "PATH": "/opt/homebrew/opt/llvm@18/bin:$penv{PATH}", - "CPPFLAGS": "-I/opt/homebrew/opt/llvm@18/include", - "LDFLAGS": "-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++" - } + "hidden": true }, { "name": "macos-clang18-x64-base", @@ -243,6 +236,13 @@ "cacheVariables": { "CONAN_HOST_PROFILE": "scwx-macos_clang-18", "CONAN_BUILD_PROFILE": "scwx-macos_clang-18" + }, + "environment": { + "CC": "/usr/local/opt/llvm@18/bin/clang", + "CXX": "/usr/local/opt/llvm@18/bin/clang++", + "PATH": "/usr/local/opt/llvm@18/bin:$penv{PATH}", + "CPPFLAGS": "-I/usr/local/opt/llvm@18/include", + "LDFLAGS": "-L/usr/local/opt/llvm@18/lib -L/usr/local/opt/llvm@18/lib/c++" } }, { @@ -252,6 +252,13 @@ "cacheVariables": { "CONAN_HOST_PROFILE": "scwx-macos_clang-18_armv8", "CONAN_BUILD_PROFILE": "scwx-macos_clang-18_armv8" + }, + "environment": { + "CC": "/opt/homebrew/opt/llvm@18/bin/clang", + "CXX": "/opt/homebrew/opt/llvm@18/bin/clang++", + "PATH": "/opt/homebrew/opt/llvm@18/bin:$penv{PATH}", + "CPPFLAGS": "-I/opt/homebrew/opt/llvm@18/include", + "LDFLAGS": "-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++" } }, { diff --git a/tools/setup-macos-debug.sh b/tools/setup-macos-debug.sh index d9c31c7e..ec24dfe2 100755 --- a/tools/setup-macos-debug.sh +++ b/tools/setup-macos-debug.sh @@ -11,12 +11,12 @@ export qt_arch=macos export address_sanitizer=${4:-disabled} # Set explicit compiler paths -export CC=/opt/homebrew/opt/llvm@18/bin/clang -export CXX=/opt/homebrew/opt/llvm@18/bin/clang++ -export PATH="/opt/homebrew/opt/llvm@18/bin:$PATH" +export CC=$(brew --prefix llvm@18)/bin/clang +export CXX=$(brew --prefix llvm@18)/bin/clang++ +export PATH="$(brew --prefix llvm@18)/bin:$PATH" -export LDFLAGS="-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++" -export CPPFLAGS="-I/opt/homebrew/opt/llvm@18/include" +export LDFLAGS="-L$(brew --prefix llvm@18)/lib -L$(brew --prefix llvm@18)/lib/c++" +export CPPFLAGS="-I$(brew --prefix llvm@18)/include" # Assign user-specified Python Virtual Environment if [ "${3:-}" = "none" ]; then diff --git a/tools/setup-macos-release.sh b/tools/setup-macos-release.sh index 39fd40e9..870dd841 100755 --- a/tools/setup-macos-release.sh +++ b/tools/setup-macos-release.sh @@ -11,12 +11,12 @@ export qt_arch=macos export address_sanitizer=${4:-disabled} # Set explicit compiler paths -export CC=/opt/homebrew/opt/llvm@18/bin/clang -export CXX=/opt/homebrew/opt/llvm@18/bin/clang++ -export PATH="/opt/homebrew/opt/llvm@18/bin:$PATH" +export CC=$(brew --prefix llvm@18)/bin/clang +export CXX=$(brew --prefix llvm@18)/bin/clang++ +export PATH="$(brew --prefix llvm@18)/bin:$PATH" -export LDFLAGS="-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++" -export CPPFLAGS="-I/opt/homebrew/opt/llvm@18/include" +export LDFLAGS="-L$(brew --prefix llvm@18)/lib -L$(brew --prefix llvm@18)/lib/c++" +export CPPFLAGS="-I$(brew --prefix llvm@18)/include" # Assign user-specified Python Virtual Environment if [ "${3:-}" = "none" ]; then