File tree Expand file tree Collapse file tree 2 files changed +11
-6
lines changed
Expand file tree Collapse file tree 2 files changed +11
-6
lines changed Original file line number Diff line number Diff 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,16 @@ 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
220+ LLD_PREFIX=$(brew --prefix lld@20)
220221
221222 brew install libomp
222223 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
224+ echo "LIBOMP=${OMP_PREFIX}/lib/libomp.dylib" >> $GITHUB_ENV
225+ echo "OpenMP_CXX_INCLUDE_DIR=${OMP_PREFIX}/include" >> $GITHUB_ENV
226+
227+ echo "LDFLAGS=-L${OMP_PREFIX}/lib:-L${LLD_PREFIX}/lib:-L${LLVM_PREFIX}/lib" >> $GITHUB_ENV
228+ echo "CPPFLAGS=-I${OMP_PREFIX}/include:-I${LLD_PREFIX}/include:-I${LLVM_PREFIX}/include" >> $GITHUB_ENV
227229
228230
229231 # TODO: The following block is an ugly hack but, at the moment (2025-02-25),
Original file line number Diff line number Diff line change @@ -163,7 +163,6 @@ INCLUDE(CheckCompilerVersion)
163163
164164# Nota: please keep all 'find_package' gathered here (for maintenance reasons)
165165message (STATUS "LuxCore - Add dependency targets" )
166- find_package (OpenMP REQUIRED)
167166find_package (TBB REQUIRED)
168167find_package (minizip REQUIRED)
169168find_package (spdlog REQUIRED)
@@ -182,8 +181,12 @@ find_package(OpenSubdiv REQUIRED)
182181find_package (nlohmann_json REQUIRED)
183182find_package (robin_hood REQUIRED)
184183if (WIN32 OR LINUX)
184+ find_package (OpenMP REQUIRED)
185185 find_package (nvrtc REQUIRED)
186186endif ()
187+ if (APPLE )
188+ find_package (OpenMP COMPONENTS CXX)
189+ endif ()
187190
188191# Bison/Flex
189192find_package (BISON REQUIRED)
You can’t perform that action at this time.
0 commit comments