From 1f3e0d148affb79e821041f67f159e1d8907235e Mon Sep 17 00:00:00 2001 From: cianciosa Date: Thu, 5 Jun 2025 12:21:41 -0400 Subject: [PATCH] Use wild cards in cmake find library path since github has xcode versions renamed. --- .github/workflows/ci_test.yaml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_test.yaml b/.github/workflows/ci_test.yaml index 35243bd..64a1a2c 100644 --- a/.github/workflows/ci_test.yaml +++ b/.github/workflows/ci_test.yaml @@ -43,7 +43,7 @@ jobs: if: ${{matrix.os == 'macos-latest'}} shell: bash working-directory: ${{runner.workspace}}/graph_framework/build - run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUSE_METAL=ON ${{runner.workspace}}/graph_framework + run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OBJCXX_COMPILER=clang++ -DUSE_METAL=ON ${{runner.workspace}}/graph_framework - name: Configure CMake Linux if: ${{matrix.os == 'ubuntu-latest'}} shell: bash diff --git a/CMakeLists.txt b/CMakeLists.txt index 6454fa6..bf53453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,7 +266,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # MCJIT isn't adding the compiler-rt library so explicitly add it. This is only # shown to happen on macOS but may affect Linux as well. find_library (MACOS_LIB_RT "clang_rt.osx" - PATHS /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/17.0.0/lib/darwin + PATHS /Applications/Xcode*.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/*/lib/darwin REQUIRED ) endif () -- GitLab