Skip to content

Commit 1649d1e

Browse files
DevanitiDevaniti
authored
Reverted LABS specific linking options for macOS (#72)
1 parent 1afdba7 commit 1649d1e

File tree

2 files changed

+146
-2
lines changed

2 files changed

+146
-2
lines changed

‎.github/workflows/build-labs.yml‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
name: Build with LABS_BUILD
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build-windows-x64:
10+
name: Build ZibraVDB for Houdini 20.5 (Windows-x64)
11+
runs-on: windows-latest
12+
steps:
13+
14+
- name: Sync
15+
uses: actions/checkout@v4
16+
17+
- name: Install Houdini
18+
working-directory: ${{ github.workspace }}
19+
shell: pwsh
20+
run: |
21+
python -m venv actions/install_houdini/venv
22+
.\actions\install_houdini\venv\Scripts\Activate.ps1
23+
pip install -r actions/install_houdini/requirements.txt
24+
python actions/install_houdini/install_houdini.py
25+
env:
26+
HOUDINI_CLIENT_ID: ${{ secrets.HOUDINI_CLIENT_ID }}
27+
HOUDINI_SECRET_KEY: ${{ secrets.HOUDINI_SECRET_KEY }}
28+
29+
- name: Configure Cmake
30+
working-directory: ${{ github.workspace }}
31+
shell: pwsh
32+
run: cmake -S . -B build-20_5-windows -G "Visual Studio 17 2022" -DLABS_BUILD=ON
33+
env:
34+
ZIBRA_HOUDINI_PATH: C:\houdini_win64-vc143_20.5
35+
36+
- name: Build Release
37+
working-directory: ${{ github.workspace }}
38+
shell: pwsh
39+
run: cmake --build build-20_5-windows --config Release
40+
41+
- name: Build Debug
42+
working-directory: ${{ github.workspace }}
43+
shell: pwsh
44+
run: cmake --build build-20_5-windows --config Debug
45+
46+
build-linux-x64:
47+
name: Build ZibraVDB for Houdini 20.5 (Linux-x64)
48+
runs-on: [self-hosted, Linux, X64, houdini]
49+
steps:
50+
51+
- name: Sync
52+
uses: actions/checkout@v4
53+
54+
- name: Configure Cmake
55+
working-directory: ${{ github.workspace }}
56+
shell: pwsh
57+
run: cmake -S . -B build-20_5-linux -G "Ninja Multi-Config" -DLABS_BUILD=ON
58+
59+
- name: Build Release
60+
working-directory: ${{ github.workspace }}
61+
shell: pwsh
62+
run: cmake --build build-20_5-linux --config Release
63+
64+
- name: Build Debug
65+
working-directory: ${{ github.workspace }}
66+
shell: pwsh
67+
run: cmake --build build-20_5-linux --config Debug
68+
69+
build-macos-arm64:
70+
name: Build ZibraVDB for Houdini 20.5 (macOS-arm64)
71+
runs-on: macos-latest
72+
concurrency:
73+
group: macos-arm64-${{ github.workflow }}-${{ github.ref }}
74+
cancel-in-progress: true
75+
steps:
76+
- name: Sync
77+
uses: actions/checkout@v4
78+
79+
- name: Install Houdini
80+
working-directory: ${{ github.workspace }}
81+
shell: pwsh
82+
run: |
83+
python3 -m venv actions/install_houdini/venv
84+
./actions/install_houdini/venv/bin/Activate.ps1
85+
pip3 install -r actions/install_houdini/requirements.txt
86+
python3 actions/install_houdini/install_houdini.py --architecture arm64
87+
env:
88+
HOUDINI_CLIENT_ID: ${{ secrets.HOUDINI_CLIENT_ID }}
89+
HOUDINI_SECRET_KEY: ${{ secrets.HOUDINI_SECRET_KEY }}
90+
91+
- name: Configure Cmake
92+
working-directory: ${{ github.workspace }}
93+
shell: pwsh
94+
run: cmake -S . -B build-20_5-macos -G "Xcode" -DCMAKE_OSX_ARCHITECTURES=arm64 -DLABS_BUILD=ON
95+
env:
96+
HFS: /Applications/Houdini/Current/Frameworks/Houdini.framework/Versions/Current/Resources
97+
98+
- name: Build Release
99+
working-directory: ${{ github.workspace }}
100+
shell: pwsh
101+
run: cmake --build build-20_5-macos --config Release
102+
103+
- name: Build Debug
104+
working-directory: ${{ github.workspace }}
105+
shell: pwsh
106+
run: cmake --build build-20_5-macos --config Debug
107+
108+
109+
build-macos-x86_64:
110+
name: Build ZibraVDB for Houdini 20.5 (macOS-x86_64)
111+
runs-on: macos-latest
112+
concurrency:
113+
group: macos-x86_64-${{ github.workflow }}-${{ github.ref }}
114+
cancel-in-progress: true
115+
steps:
116+
- name: Sync
117+
uses: actions/checkout@v4
118+
119+
- name: Install Houdini
120+
working-directory: ${{ github.workspace }}
121+
shell: pwsh
122+
run: |
123+
python3 -m venv actions/install_houdini/venv
124+
./actions/install_houdini/venv/bin/Activate.ps1
125+
pip3 install -r actions/install_houdini/requirements.txt
126+
python3 actions/install_houdini/install_houdini.py --architecture x86_64
127+
env:
128+
HOUDINI_CLIENT_ID: ${{ secrets.HOUDINI_CLIENT_ID }}
129+
HOUDINI_SECRET_KEY: ${{ secrets.HOUDINI_SECRET_KEY }}
130+
131+
- name: Configure Cmake
132+
working-directory: ${{ github.workspace }}
133+
shell: pwsh
134+
run: cmake -S . -B build-20_5-macos -G "Xcode" -DCMAKE_OSX_ARCHITECTURES=x86_64 -DLABS_BUILD=ON
135+
env:
136+
HFS: /Applications/Houdini/Current/Frameworks/Houdini.framework/Versions/Current/Resources
137+
138+
- name: Build Release
139+
working-directory: ${{ github.workspace }}
140+
shell: pwsh
141+
run: cmake --build build-20_5-macos --config Release
142+
143+
- name: Build Debug
144+
working-directory: ${{ github.workspace }}
145+
shell: pwsh
146+
run: cmake --build build-20_5-macos --config Debug

‎CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ target_link_libraries(ZibraVDBForHoudini PRIVATE Houdini)
197197

198198
if (NOT "${ZIB_TARGET_OS_NAME}" STREQUAL "MAC")
199199
target_link_libraries(ZibraVDBForHoudini PRIVATE Houdini::Dep::openvdb_sesi)
200-
elseif (${LABS_BUILD})
201-
target_link_libraries(ZibraVDBForHoudini PRIVATE Houdini::Dep::openvdb_sesi Houdini::Dep::tbb)
202200
endif()
203201

204202
if(${LABS_BUILD})

0 commit comments

Comments
 (0)