OSX/buildsystems: unify openmp handling by changing iomp5 id to @loader_path/../Resou...
authorJens Verwiebe <info@jensverwiebe.de>
Sun, 16 Nov 2014 16:03:44 +0000 (17:03 +0100)
committerJens Verwiebe <info@jensverwiebe.de>
Sun, 16 Nov 2014 16:03:44 +0000 (17:03 +0100)
This makes install_name_tool usage obsolete here and also assures cmake builds can be codesigned.
IMPORTANT: update lib (darwin-9.x.universal/openmp)

CMakeLists.txt
build_files/scons/tools/Blender.py
source/creator/CMakeLists.txt

index 316191af4fcb637bba8c8235c6bd846f427b52de..acf1bb4b754596ade7140bd869030fa1625d7a5d 100644 (file)
@@ -2049,7 +2049,7 @@ elseif(APPLE)
                                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
-                               execute_process(COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/bin/libiomp5.dylib) # for intermediate binaries, lib id @loader_path
+                               execute_process(COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries, lib id @loader_path
                        endif()
                endif()
        endif()
index b5853b22455787fcde9cefabc6b3046c15e0cb78..f5118daad6a82ed1489b0bb2a78a9e6072e7c663 100755 (executable)
@@ -809,10 +809,6 @@ def AppIt(target=None, source=None, env=None):
             instname = env['LCGDIR'][1:] # made libiomp5 part of blender libs
             cmd = 'ditto --arch %s %s/openmp/lib/libiomp5.dylib %s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) # copy libiomp5
             commands.getoutput(cmd)
-            cmd = 'install_name_tool -id @loader_path/../Resources/lib/libiomp5.dylib %s/%s.app/Contents/Resources/lib/libiomp5.dylib'%(installdir, binary) # change id of libiomp5
-            commands.getoutput(cmd)
-            cmd = 'install_name_tool -change @loader_path/libiomp5.dylib  @loader_path/../Resources/lib/libiomp5.dylib %s/%s.app/Contents/MacOS/%s'%(installdir, binary, binary) # change ref to libiomp5 ( blender )
-            commands.getoutput(cmd)
 
 # extract copy system python, be sure to update other build systems
 # when making changes to the files that are copied.
index bb669b6f2967cda3e502170879cc495f7472615d..434f3c40e74bab93a91a39a2fc593bd010ba72e4 100644 (file)
@@ -837,7 +837,7 @@ elseif(APPLE)
        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 blender.app/Contents/MacOS
+                       DESTINATION blender.app/Contents/Resources/lib/
                )
        endif()