diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-07 05:06:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-07 05:08:24 +0300 |
| commit | 2440415bd32a11561a1b7a57f9740978b2f93bdf (patch) | |
| tree | d6252c8470a53a4121f207520e4192fef99f049e /build_files | |
| parent | 83de7c4094beb73036e71b5170502512c6936766 (diff) | |
| parent | 0e3fd70d7ac62c12ed85d3a90266994fac26bad0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 7e3f889b73f..ca01e08afe9 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -390,22 +390,6 @@ if(WITH_OPENMP) set(WITH_OPENMP OFF) else() # vanilla gcc or clang_omp support OpenMP message(STATUS "Using special OpenMP enabled compiler !") # letting find_package(OpenMP) module work for gcc - if(CMAKE_C_COMPILER_ID MATCHES "Clang") # clang-omp in darwin libs - set(OPENMP_FOUND ON) - 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) - # This is a workaround for our helperbinaries ( datatoc, masgfmt, ... ), - # They are linked also to omp lib, so we need it in builddir for runtime exexcution, - # TODO: remove all unneeded dependencies from these - - # for intermediate binaries, in respect to lib ID - execute_process( - COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} - ${LIBDIR}/openmp/lib/libiomp5.dylib - ${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) - endif() endif() endif() |