Merge branch 'master' into blender2.8

2017-11-07 03:06:18 +01:00
parent 83de7c4094 0e3fd70d7a
commit 2440415bd3
4 changed files with 5 additions and 32 deletions
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -900,18 +900,6 @@ elseif(APPLE)
 		blender.app/Contents/
 	)

-	if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
-		install(
-			FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
-			DESTINATION blender.app/Contents/Resources/lib/
-		)
-		install(
-			FILES ${LIBDIR}/openmp/LICENSE.txt
-			DESTINATION "."
-			RENAME LICENSE-libiomp5.txt
-		)
-	endif()
-
 	if(WITH_LLVM AND NOT LLVM_STATIC)
 		install(
 			FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib