Skip to content

Commit 1bca411

Browse files
committed
Fix OpenMP for MacOS
1 parent fa48631 commit 1bca411

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/workflows/wheel-builder.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ jobs:
207207
# actually we use recent version of llvm, to get full compatibility
208208
# with C++20
209209
brew install llvm@20
210-
211210
LLVM_PREFIX=$(brew --prefix llvm@20)
212211
echo "PATH=$LLVM_PREFIX/bin:$PATH" >> $GITHUB_ENV
213212
echo "CC=clang" >> $GITHUB_ENV
@@ -217,13 +216,10 @@ jobs:
217216
echo "LD=ld.lld" >> $GITHUB_ENV
218217
echo "DYLD_LIBRARY_PATH=$LLVM_PREFIX/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
219218
219+
brew install lld@20
220220
221221
brew install libomp
222-
OMP_PREFIX=$(brew --prefix libomp)
223-
echo "LIBOMP=$OMP_PREFIX/lib/libomp.dylib" >> $GITHUB_ENV
224-
echo "LDFLAGS=-L/usr/local/opt/libomp/lib:LDFLAGS" >> $GITHUB_ENV
225-
echo "CPPFLAGS=-I/usr/local/opt/libomp/include" >> $GITHUB_ENV
226-
#echo "LDFLAGS=-fuse-ld=ld.lld" >> $GITHUB_ENV
222+
echo "OpenMP_ROOT=$(brew --prefix libomp)" >> $GITHUB_ENV
227223
228224
229225
# TODO: The following block is an ugly hack but, at the moment (2025-02-25),

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ INCLUDE(CheckCompilerVersion)
163163

164164
# Nota: please keep all 'find_package' gathered here (for maintenance reasons)
165165
message(STATUS "LuxCore - Add dependency targets")
166-
find_package(OpenMP REQUIRED)
167166
find_package(TBB REQUIRED)
168167
find_package(minizip REQUIRED)
169168
find_package(spdlog REQUIRED)
@@ -181,6 +180,7 @@ find_package(Eigen3 REQUIRED)
181180
find_package(OpenSubdiv REQUIRED)
182181
find_package(nlohmann_json REQUIRED)
183182
find_package(robin_hood REQUIRED)
183+
find_package(OpenMP REQUIRED)
184184
if (WIN32 OR LINUX)
185185
find_package(nvrtc REQUIRED)
186186
endif()

0 commit comments

Comments
 (0)