Browse Source

Trust frameworks with @rpath instead of overwriting them with our own paths.

Tobias Hieta 9 years ago
parent
commit
fad3e5b215
2 changed files with 1 additions and 8 deletions
  1. 0 7
      CMakeModules/CompleteBundleOSX.cmake.in
  2. 1 1
      scripts/fix-install-names.py

+ 0 - 7
CMakeModules/CompleteBundleOSX.cmake.in

@@ -20,13 +20,6 @@ execute_process(
   WORKING_DIRECTORY @QTROOT@/bin
 )
 
-# Run the macdeploy command again to be able to fixup the linked paths for QtWebEngineProcess that
-# is deployed by the first run.
-execute_process(
-  COMMAND @QTROOT@/bin/macdeployqt ${app} -executable=${weprocess}/Contents/MacOS/QtWebEngineProcess
-  WORKING_DIRECTORY @QTROOT@/bin
-)
-
 #set(ENTITLEMENTS --entitlements @SOURCE_ROOT@/bundle/osx/Konvergo.entitlements)
 set(CODESIGN codesign ${ENTITLEMENTS} --force --sign "Developer ID Application: Plex Inc.")
 

+ 1 - 1
scripts/fix-install-names.py

@@ -45,7 +45,7 @@ def fix_install_name(path):
             l = l.rstrip().strip()
 
             # See if we need to fix it up.
-            if len(l) > 0 and (l.startswith("/Users/admin/") or l[0] != '/'):
+            if len(l) > 0 and (l.startswith("/Users/admin/") or (l[0] != '/' and not l.startswith("@rpath"))):
               current_lib = l.split(" (compat")[0]
               current_basename = os.path.basename(current_lib)
               correct_lib = os.path.join(root, current_basename)