[Bf-blender-cvs] [058bc50] master: OSX: tentative fix for D472, ditto creates dirs when needed automatically, also thin out lib. Todo: rather not build the intermediate bins with openmp dependency anyway
Jens Verwiebe
noreply at git.blender.org
Tue Apr 22 12:28:07 CEST 2014
Commit: 058bc50799b469f36ef091eb3afc0806ce9de54b
Author: Jens Verwiebe
Date: Tue Apr 22 12:27:35 2014 +0200
https://developer.blender.org/rB058bc50799b469f36ef091eb3afc0806ce9de54b
OSX: tentative fix for D472, ditto creates dirs when needed automatically, also thin out lib. Todo: rather not build the intermediate bins with openmp dependency anyway
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c1f799..74a662a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1891,7 +1891,7 @@ elseif(APPLE)
set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE)
include_directories(${LIBDIR}/openmp/include)
LINK_DIRECTORIES(${LIBDIR}/openmp/lib)
- execute_process(COMMAND cp ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/bin/libiomp5.dylib) # for intermediate binaries, lib id is @loader_path
+ 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
More information about the Bf-blender-cvs
mailing list