Commit 5ee06d74 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Merge branch 'ci_paths' into 'main' 

Use wild cards in cmake find library path since github has xcode versions renamed.

See merge request !72
parents 132cf1c2 1f3e0d14

.github/workflows/ci_test.yaml

+1 −1
Original line number Diff line number Diff line
@@ -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

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 ()