|
54 | 54 | if: matrix.platform == 'macos-13' |
55 | 55 | shell: bash |
56 | 56 | run: | |
| 57 | + brew install llvm |
57 | 58 | python3 -m pip install conan |
58 | 59 | conan --version |
59 | 60 | mkdir -p ~/.conan2/profiles/ |
@@ -100,12 +101,20 @@ jobs: |
100 | 101 | run: | |
101 | 102 | conan install . --output-folder build --build=missing -o include_messaging=False |
102 | 103 |
|
103 | | - - name: Install Dependencies through Conan on MacOS |
104 | | - if: matrix.platform == 'macos-13' || matrix.platform == 'macos-latest' |
| 104 | + - name: Install Dependencies through Conan on ARM MacOS |
| 105 | + if: matrix.platform == 'macos-latest' |
105 | 106 | shell: bash |
106 | 107 | run: | |
107 | 108 | conan install . --output-folder build --build=missing |
108 | 109 |
|
| 110 | + - name: Install Dependencies through Conan on Intel MacOS |
| 111 | + if: matrix.platform == 'macos-13' |
| 112 | + shell: bash |
| 113 | + run: | |
| 114 | + CC=$(brew --prefix llvm)/bin/clang \ |
| 115 | + CXX=$(brew --prefix llvm)/bin/clang++ \ |
| 116 | + conan install . --output-folder build --build=missing |
| 117 | +
|
109 | 118 | - name: Install Dependencies through Conan on Linux <x86_64> |
110 | 119 | if: matrix.platform == 'ubuntu-latest' |
111 | 120 | shell: bash |
@@ -139,13 +148,23 @@ jobs: |
139 | 148 | cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release |
140 | 149 | cmake --build . --config Release |
141 | 150 |
|
142 | | - - name: Build Unix |
143 | | - if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-13' || matrix.platform == 'macos-latest' |
| 151 | + - name: Build Non-Intel-Mac Unix |
| 152 | + if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-latest' |
| 153 | + run: | |
| 154 | + echo "working dir is $PWD" |
| 155 | + cd build |
| 156 | + source conanbuild.sh |
| 157 | + cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release |
| 158 | + cmake --build . --config Release |
| 159 | +
|
| 160 | + - name: Build Intel Mac |
| 161 | + if: matrix.platform == 'macos-13' |
144 | 162 | run: | |
145 | 163 | echo "working dir is $PWD" |
146 | | - |
147 | 164 | cd build |
148 | 165 | source conanbuild.sh |
| 166 | + CC=$(brew --prefix llvm)/bin/clang \ |
| 167 | + CXX=$(brew --prefix llvm)/bin/clang++ \ |
149 | 168 | cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release |
150 | 169 | cmake --build . --config Release |
151 | 170 |
|
|
0 commit comments