diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2019-01-11 21:10:52 +0300 |
|---|---|---|
| committer | Dominik Schmidt <domme@tomahawk-player.org> | 2019-01-14 14:21:06 +0300 |
| commit | 772f3d2dbf102f59efe5954c87cf384fe91778c3 (patch) | |
| tree | 37e7e501e0999f4bb7db65daac21a55d9b7dd58c | |
| parent | a3f354687946eafb6fcbb4191c92330aaa3a9999 (diff) | |
Do not run macdeployqt.py from CMake.
| -rw-r--r-- | src/cmd/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/crashreporter/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 13 |
3 files changed, 0 insertions, 37 deletions
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 76b1c75db..da61b6bf9 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -34,15 +34,3 @@ elseif(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 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 paths...\") - execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE} ${QT_QMAKE_EXECUTABLE}) - " COMPONENT RUNTIME) -endif() diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt index 072e1fb6c..3550f21e7 100644 --- a/src/crashreporter/CMakeLists.txt +++ b/src/crashreporter/CMakeLists.txt @@ -58,16 +58,4 @@ 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 paths...\") - execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE} ${QT_QMAKE_EXECUTABLE}) - " COMPONENT RUNTIME) - endif() endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 2bfbb2aa9..50d674f39 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -340,19 +340,6 @@ install(TARGETS ${APPLICATION_EXECUTABLE} BUNDLE DESTINATION "." ) - -# 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 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 paths...\") - execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE} ${QT_QMAKE_EXECUTABLE}) - " COMPONENT RUNTIME) -endif() - if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32) configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop) |