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:
authorJens Verwiebe <info@jensverwiebe.de>2014-11-16 19:03:44 +0300
committerJens Verwiebe <info@jensverwiebe.de>2014-11-16 19:03:44 +0300
commitfa821a969ea935b0251f9aa0c893ab174e03a580 (patch)
tree17a36453c54bbe3fa22d7cbd83232fc09ac255ad /build_files
parent97e2d62c79fc30eacdbcb7d0464ed6d1726833a5 (diff)
OSX/buildsystems: unify openmp handling by changing iomp5 id to @loader_path/../Resources/lib/libiomp5.dylib
This makes install_name_tool usage obsolete here and also assures cmake builds can be codesigned. IMPORTANT: update lib (darwin-9.x.universal/openmp)
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/scons/tools/Blender.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index b5853b22455..f5118daad6a 100755
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -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.