[Bf-blender-cvs] [f992c928727] blender2.7: Fix blenderplayer build after OpenMP changes.

Brecht Van Lommel noreply at git.blender.org
Mon Jan 28 13:05:55 CET 2019


Commit: f992c92872743cb1ab6ae773eeae19d816a92274
Author: Brecht Van Lommel
Date:   Mon Jan 28 13:04:20 2019 +0100
Branches: blender2.7
https://developer.blender.org/rBf992c92872743cb1ab6ae773eeae19d816a92274

Fix blenderplayer build after OpenMP changes.

===================================================================

M	source/creator/CMakeLists.txt

===================================================================

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index d2255bbd894..1ce8a8d1c4c 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -979,14 +979,13 @@ elseif(APPLE)
 			blenderplayer.app/Contents/
 		)
 
-		if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
+		if(WITH_OPENMP AND OPENMP_CUSTOM)
 			install(
-				FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
-				DESTINATION blenderplayer.app/Contents/Resources/lib/
+				FILES ${LIBDIR}/openmp/lib/libomp.dylib
+				DESTINATION blenderplayer.app/Contents/Resources/lib
 			)
 		endif()
 
-
 		# python
 		if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
 			# Copy the python libs into the install directory



More information about the Bf-blender-cvs mailing list