Skip to content

Commit

Permalink
trying to combine the versions again
Browse files Browse the repository at this point in the history
  • Loading branch information
K20shores committed Jun 17, 2024
1 parent f1e7670 commit 1e1e9d5
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
- { cpp: g++-13, c: gcc-13, fc: gfortran-13}
- { cpp: clang++, c: clang}
build_type: [Release]
macos_sdk: [macosx15.0]
env:
CC: ${{ matrix.compiler.c }}
CXX: ${{ matrix.compiler.cpp }}
Expand All @@ -44,19 +43,13 @@ jobs:
- name: Run Cmake
if: matrix.compiler.cpp != 'g++-13'
run: |
PYTHON_PATH=$(which python)
cmake -S . -B build \
-D CMAKE_CXX_FLAGS=-Wl,-ld_classic \
-D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-D MUSICA_ENABLE_PYTHON_LIBRARY=ON \
-D Python3_EXECUTABLE=$PYTHON_PATH
- name: Run cmake for gcc 13
if: matrix.compiler.cpp == 'g++-13'
run: |
PYTHON_PATH=$(which python)
export SDKROOT=$(xcrun --sdk ${{ matrix.macos_sdk }} --show-sdk-path)
# for some reason gcc 13 was having issues finding the correct osx sdk
# the default compiler was xcode 15.01 which is compatible with macosx14.0
# finding that explicitly here fixes the issue but will likely break in future versions
# all versions can be found here: https://github.com/actions/runner-images/tree/main/images/macos
export SDKROOT=$(xcrun --sdk macosx14.0 --show-sdk-path)
cmake -S . -B build \
-D CMAKE_CXX_FLAGS=-Wl,-ld_classic \
-D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
Expand Down

0 comments on commit 1e1e9d5

Please sign in to comment.