Skip to content

Commit e773169

Browse files
committed
MacOS: define CC, CXX etc. in Conan profile
1 parent 803de99 commit e773169

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ jobs:
168168
with:
169169
script: |
170170
if ('${{ runner.arch }}' == 'X64') {
171-
target = '10.15';
171+
target = '13.0';
172172
arch='x86_64';
173173
}
174174
else {
175-
target = '12.0';
175+
target = '14.2';
176176
arch='armv8';
177177
}
178178
core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
@@ -196,6 +196,10 @@ jobs:
196196
shell: bash
197197
run: |
198198
brew install ispc
199+
brew install llvm
200+
brew install libomp
201+
cp -R /usr/local/opt/llvm/Toolchains/LLVM20.xctoolchain /Applications/Xcode_15.2.app/Contents/Developer/Toolchains
202+
export PATH=$(brew --prefix llvm)/bin:$PATH
199203
bash ${{ env.WORKSPACE }}/install-conan.sh
200204
201205
- name: Build (Linux)
@@ -397,10 +401,10 @@ jobs:
397401
path: conan-cache
398402
key: deps-${{ matrix.os }}-${{ github.run_id }}
399403

400-
## For debugging
401-
#- name: Setup tmate session (debug)
402-
#if: ${{ failure() }}
403-
#uses: mxschmitt/action-tmate@v3
404+
# For debugging
405+
- name: Setup tmate session (debug)
406+
if: ${{ failure() }}
407+
uses: mxschmitt/action-tmate@v3
404408

405409
# Upload artifacts
406410
- uses: actions/upload-artifact@v4

conan-profiles/conan-profile-macOS-ARM64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ minizip-ng/*:with_libcomp=False
1919
[buildenv]
2020
CXX=clang++
2121
CC=clang
22+
AR=llvm-ar
23+
RANLIB=llvm-ranlib
24+
LD=ld.lld
2225

2326
[conf]
2427
&:tools.build:cxxflags=["-O3"]

conan-profiles/conan-profile-macOS-X64

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ include(conan-profile-common)
22

33
[settings]
44
os=Macos
5-
os.version=10.15
5+
# 13.0 is required by libomp
6+
os.version=13.0
67
arch=x86_64
78
compiler=apple-clang
8-
compiler.version=14.0
9+
compiler.version=15
910
compiler.cppstd={{ os.getenv("CXX_VERSION") }}
1011
compiler.libcxx=libc++
1112

@@ -21,8 +22,12 @@ openvdb/*:simd=AVX
2122
opensubdiv/*:with_metal=False
2223

2324
[buildenv]
24-
CXX=clang++
25-
CC=clang
25+
CXX=/usr/local/opt/llvm/bin/clang++
26+
CC=/usr/local/opt/llvm/bin/clang
27+
AR=/usr/local/opt/llvm/bin/llvm-ar
28+
RANLIB=/usr/local/opt/llvm/bin/llvm-ranlib
29+
LD=/usr/local/opt/llvm/bin/ld.lld
30+
#INSTALL=/usr/local/opt/llvm/bin/llvm-install-name-tool
2631

2732
[conf]
2833
&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2"]

0 commit comments

Comments
 (0)