File tree Expand file tree Collapse file tree 2 files changed +16
-5
lines changed
Expand file tree Collapse file tree 2 files changed +16
-5
lines changed Original file line number Diff line number Diff line change 5454 if : matrix.platform == 'macos-13'
5555 shell : bash
5656 run : |
57+ brew install llvm
5758 python3 -m pip install conan
5859 conan --version
5960 mkdir -p ~/.conan2/profiles/
@@ -139,13 +140,23 @@ jobs:
139140 cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
140141 cmake --build . --config Release
141142
142- - name : Build Unix
143- if : matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-13' || matrix.platform == 'macos-latest'
143+ - name : Build Non-Intel-Mac Unix
144+ if : matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-latest'
145+ run : |
146+ echo "working dir is $PWD"
147+ cd build
148+ source conanbuild.sh
149+ cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
150+ cmake --build . --config Release
151+
152+ - name : Build Intel Mac
153+ if : matrix.platform == 'macos-13'
144154 run : |
145155 echo "working dir is $PWD"
146-
147156 cd build
148157 source conanbuild.sh
158+ CC=$(brew --prefix llvm)/bin/clang \
159+ CXX=$(brew --prefix llvm)/bin/clang++ \
149160 cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
150161 cmake --build . --config Release
151162
Original file line number Diff line number Diff line change 11[settings]
22arch=x86_64
33build_type=Release
4- compiler=apple- clang
4+ compiler=clang
55compiler.cppstd=20
66compiler.libcxx=libc++
7- compiler.version=15
7+ compiler.version=19
88os=Macos
You can’t perform that action at this time.
0 commit comments