Skip to content

Commit

Permalink
Merge pull request #5427 from janimatic/fixMacBuildV2
Browse files Browse the repository at this point in the history
Fix mac build v2 : staying on c++11, macos-12, x86-64...
  • Loading branch information
RodneyBaker authored Apr 26, 2024
2 parents be3a35f + 8304de0 commit 54063bb
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/workflow_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ on: [push, pull_request]

jobs:
macOS:
runs-on: macos-latest
# runs-on: macos-latest
# avoid the headache of arm64 builds?
runs-on: macos-12
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -68,8 +70,10 @@ jobs:
cd toonz
mkdir build
cd build
cmake ../sources -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQT_PATH='/usr/local/opt/qt@5/lib' -DWITH_TRANSLATION=OFF
ninja -w dupbuild=warn
# cmake ../sources -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQT_PATH='/usr/local/opt/qt@5/lib' -DWITH_TRANSLATION=OFF
cmake ../sources -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQT_PATH=$(brew --prefix qt@5)/lib -DQt5_DIR=$(brew --prefix qt@5)/lib/cmake/Qt5 -DCMAKE_PREFIX_PATH=$(brew --prefix qt@5)/lib/cmake/Qt5 -DWITH_TRANSLATION=OFF
# ninja -w dupbuild=warn
ninja
- name: Introduce Libraries and Stuff
run: |
Expand Down

0 comments on commit 54063bb

Please sign in to comment.