Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-02-19 02:38:48 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-02-19 02:38:56 +0400
commitad4c12fe01d47d5b3092865ecdb9f49cf8c79aaf (patch)
treef5f3080959d42b6e3a47f84643fa6f0a1847e6d8 /source
parentace071f99eba5a0d51ed05ae01a3e42499ffc02b (diff)
OSX/CMAKE: make linking and bundling of clang omp lib work,
Cmake will still not find -fopenmp working, so the user must set WITH_OPENMP and flags manually
Diffstat (limited to 'source')
-rw-r--r--source/creator/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 2a355bd5606..a56af902188 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -773,6 +773,13 @@ elseif(APPLE)
\${TARGETDIR}/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 ${TARGETDIR}/blender.app/Contents/MacOS
+ )
+ endif()
+
# python
if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# the python zip is first extract as part of the build process,
@@ -843,7 +850,7 @@ elseif(APPLE)
endif()
endif()
-
+
endif()
# -----------------------------------------------------------------------------