Merge branch 'blender2.7'

2019-01-26 15:54:13 +01:00
parent 115e1d441b b7a9e980a1
commit 94d88df3a8
9 changed files with 38 additions and 15 deletions
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -908,6 +908,13 @@ elseif(APPLE)
 		blender.app/Contents/
 	)

+	if(WITH_OPENMP AND OPENMP_CUSTOM)
+		install(
+			FILES ${LIBDIR}/openmp/lib/libomp.dylib
+			DESTINATION blender.app/Contents/Resources/lib
+		)
+	endif()
+
 	if(WITH_LLVM AND NOT LLVM_STATIC)
 		install(
 			FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib