diff options
| author | Markus Goetz <markus@woboq.com> | 2014-10-09 18:49:36 +0400 |
|---|---|---|
| committer | Markus Goetz <markus@woboq.com> | 2014-10-09 18:50:03 +0400 |
| commit | f0fef4f23242f101911305641454dcbb5d3e6424 (patch) | |
| tree | a5d4d28fb3f7cefee26c86cf90df67e005276d3d /src/CMakeLists.txt | |
| parent | 7eb10a08b8b465012d7934a8cb0b39dbf2f028b9 (diff) | |
OS X: Fix .app creation for non-system Qt
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 58b44d13d..a3b07bf20 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() |