[Pkg-owncloud-commits] [owncloud-client] 108/164: Fix a crash in the crash reporter on OSX

[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 99f51998f2f07a43b81cd6f75ec5f65d54664b9d
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Fri Mar 6 19:11:51 2015 +0100

    Fix a crash in the crash reporter on OSX
    
    The install_name of dependent libraries need to be updated
    like we do for cmd and gui.
---
 src/crashreporter/CMakeLists.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
index cb9dbfc..158d39a 100644
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -50,4 +50,16 @@ if(NOT BUILD_LIBRARIES_ONLY)
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
+
+    # FIXME: The following lines are dup in src/gui and src/cmd because it needs to be done after both are installed
+    #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
+    # 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)
+       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} ${QT_QMAKE_EXECUTABLE})
+        " COMPONENT RUNTIME)
+    endif()
 endif()

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