[Pkg-owncloud-commits] [owncloud-client] 30/211: OS X: Fix .app creation for non-system Qt

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit f0fef4f23242f101911305641454dcbb5d3e6424
Author: Markus Goetz <markus at woboq.com>
Date:   Thu Oct 9 16:49:36 2014 +0200

    OS X: Fix .app creation for non-system Qt
---
 admin/osx/macdeployqt.py | 7 ++++---
 src/CMakeLists.txt       | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py
index 02b3dfe..278c666 100755
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -23,7 +23,7 @@ import sys
 from glob import glob
 
 def QueryQMake(attrib):
-    return subprocess.check_output(['qmake', '-query', attrib]).rstrip('\n')
+    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
 
 FRAMEWORK_SEARCH_PATH=[
     '/Library/Frameworks',
@@ -71,14 +71,15 @@ class CouldNotFindScriptPluginError(Error):
 class CouldNotFindFrameworkError(Error):
   pass
 
-if len(sys.argv) < 2:
-  print 'Usage: %s <bundle.app>' % sys.argv[0]
+if len(sys.argv) < 3:
+  print 'Usage: %s <bundle.app> <path-to-qmake>' % sys.argv[0]
   exit()
 
 def is_exe(fpath):
   return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
 
 bundle_dir = sys.argv[1]
+qmake_path = sys.argv[2]
 
 bundle_name = os.path.basename(bundle_dir).split('.')[0]
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58b44d1..a3b07bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -383,7 +383,8 @@ if(NOT BUILD_LIBRARIES_ONLY)
           RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
   )
   set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-	  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+          INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/" )
+
 
   target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
   target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
@@ -442,8 +443,9 @@ endif()
 # currently it needs to be done because the code right above needs to be executed no matter
 # if building a bundle or not and the install_qt4_executable needs to be called afterwards
 if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
+   get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
    install(CODE "
     message(STATUS \"Deploying (Qt) dependencies and fixing library pathes...\")
-    execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE})
+    execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE} ${QT_QMAKE_EXECUTABLE})
     " COMPONENT RUNTIME)
 endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git