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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-06-29 00:18:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-06-29 00:19:51 +0400
commitb5982f71306c44b0abdce3f2be69c0c586164b79 (patch)
tree59bf7ea2367403b5402dd4167d69cb39ee381451 /CMakeLists.txt
parentb5acd1aa87dc145f69c342a593b25de8faf472e1 (diff)
CMake: attempt to resolve OSX+clang failing with OpenMP
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a95d66dc40e..19d457b9775 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1891,11 +1891,11 @@ elseif(APPLE)
set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "C compiler flags for OpenMP parallization" FORCE)
set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE)
include_directories(${LIBDIR}/openmp/include)
- LINK_DIRECTORIES(${LIBDIR}/openmp/lib)
+ link_directories(${LIBDIR}/openmp/lib)
+ # XXX, BAD PRACTICE, DON'T DO THIS!!!
execute_process(COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/bin/libiomp5.dylib) # for intermediate binaries, lib id is @loader_path
else()
- set(OpenMP_C_FLAGS "" CACHE STRING "C compiler flags for OpenMP parallization" FORCE) # unset
- set(OpenMP_CXX_FLAGS "" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE) # unset
+ set(WITH_OPENMP OFF)
endif()
set(EXETYPE MACOSX_BUNDLE)