blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

fix build on xcode with openmp

This commit is contained in:
Arto Kitula 2019-02-13 22:34:40 +02:00
parent 8365de52bc
commit 11ec57e211
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_files/cmake/platform/platform_apple.cmake
View File

@ -394,10 +394,16 @@ if(WITH_OPENMP)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${LIBDIR}/openmp/lib -lomp")
# Copy libomp.dylib to allow executables like datatoc to work.
execute_process(
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
)
if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild")
set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}/bin")
else()
set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}")
endif()
execute_process(
COMMAND mkdir -p ${OPENMP_DYLIB_AUX_PATH}/Resources/lib
COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${OPENMP_DYLIB_AUX_PATH}/Resources/lib/libomp.dylib
)
endif()
endif()

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 4be9fbe61cb1e23baf25c9c379ecd13e22ca1898
Subproject commit f81ed052157aff3979763cf25840032d11d261b6

2
release/scripts/addons

@ -1 +1 @@
Subproject commit f999cc0908333ac0d4b2b203706f3eb640ba54c9
Subproject commit 890a240c550430f9866352d3f1fd8a8c34840c4b

2
source/tools

@ -1 +1 @@
Subproject commit 83428cbf0a8d7e0bdd7a91c00124381c1db42e70
Subproject commit 3f0d91e9249bf35b92ee745e2c45c460c869fb25