Skip to content

Commit 7432486

Browse files
committed
Opensubdiv/MacOS: fix OpenMP dep
1 parent ffec3de commit 7432486

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,10 @@ jobs:
255255
#dnf -y install cuda-nvrtc-12-8
256256
#dnf repoquery -l cuda-nvrtc-12-8
257257
258-
CIBW_BEFORE_ALL_MACOS: brew install ispc
258+
CIBW_BEFORE_ALL_MACOS: |
259+
brew install ispc
260+
brew install llvm
261+
export PATH="/usr/local/opt/llvm/bin:$PATH"
259262
260263
CIBW_BEFORE_BUILD: bash ${{ env.WORKSPACE }}/install-conan.sh
261264

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
IMGUIFILEDIALOG_VERSION = "0.6.7"
2323
JSON_VERSION = "3.11.3"
2424
LIBDEFLATE_VERSION = "1.22"
25-
LLVM_OPENMP_VERSION = "18.1.8"
25+
LLVM_OPENMP_VERSION = "17.0.6"
2626
MINIZIP_VERSION = "4.0.3"
2727
NINJA_VERSION = "1.12.1"
2828
NVRTC_VERSION = "12.8.61"

local-conan-recipes/opensubdiv/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def _patch_sources(self):
158158
self,
159159
os.path.join(self.source_folder, "opensubdiv", "osd", "CMakeLists.txt"),
160160
"target_link_libraries(osd_cpu_obj",
161-
"target_link_libraries(osd_cpu_obj llvm-openmp::llvm-openmp"
161+
"target_link_libraries(osd_cpu_obj OpenMP::OpenMP",
162162
)
163163
# No warnings as errors
164164
replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"), "/WX", "")

0 commit comments

Comments
 (0)