File tree Expand file tree Collapse file tree 2 files changed +2
-5
lines changed
Expand file tree Collapse file tree 2 files changed +2
-5
lines changed Original file line number Diff line number Diff line change @@ -49,17 +49,14 @@ jobs:
4949 wget https://apt.llvm.org/llvm.sh
5050 chmod 755 llvm.sh
5151 echo "" | sudo ./llvm.sh 20
52- sudo apt-get update
5352 sudo apt-get install -y perl autoconf-archive ninja-build cmake pkg-config clang-20 lldb-20 lld-20 clangd-20
5453 sudo ln -f /usr/bin/clang-20 /usr/bin/clang
5554 sudo ln -f /usr/bin/clang++-20 /usr/bin/clang++
5655
5756 - name : Install development environment (MacOS)
5857 if : matrix.os.on == 'macos-26'
5958 run : |
60- brew update
6159 brew install automake autoconf autoconf-archive
62- sudo dtruss cmake -GNinja . 2>&1 | grep -i ninja
6360
6461 - name : Create vcpkg cache dir
6562 run : mkdir ${{env.VCPKG_DEFAULT_BINARY_CACHE}}
8077 key : vcpkg-cache-${{matrix.os.tripple}}-${{hashFiles('vcpkg.json', 'vcpkg/commit.txt')}}
8178
8279 - name : CMake - Configure
83- run : cmake --preset=${{matrix.os.tripple}} .
80+ run : cmake -D "CMAKE_MAKE_PROGRAM=/opt/homebrew/bin/ninja" - -preset=${{matrix.os.tripple}} .
8481
8582 - name : Save vcpkg binary-cache
8683 uses : actions/cache/save@v4
Original file line number Diff line number Diff line change 6363 "cacheVariables" : {
6464 "CMAKE_OSX_ARCHITECTURES" : " arm64" ,
6565 "VCPKG_TARGET_TRIPLET" : " arm64-osx" ,
66- "CMAKE_MAKE_PROGRAM " : " /opt/homebrew/bin/ninja"
66+ "FOOCMAKE_MAKE_PROGRAM " : " /opt/homebrew/bin/ninja"
6767 },
6868 "condition" : {
6969 "type" : " equals" ,
You can’t perform that action at this time.
0 commit comments