diff options
| author | Jocelyn Turcotte <jturcotte@woboq.com> | 2015-03-06 21:11:51 +0300 |
|---|---|---|
| committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2015-03-06 21:28:53 +0300 |
| commit | 99f51998f2f07a43b81cd6f75ec5f65d54664b9d (patch) | |
| tree | 1a5b9624f57438c19e7a65ff377caad08f829062 /src/crashreporter | |
| parent | 4c13992f5dc587883ae123df4b352859c44c9feb (diff) | |
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.
Diffstat (limited to 'src/crashreporter')
| -rw-r--r-- | src/crashreporter/CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt index cb9dbfc0b..158d39a17 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() |