CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-07-01 21:02:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6500 from jpwhiting/use_macdeployqt

Browse Source 
Use macdeployqt to install Qt frameworks inside bundle
This commit is contained in:
Jnewbon 2020-07-12 14:05:31 +01:00 committed by GitHub
commit c5814be90d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/CMakeLists.txt
View File

@ -25,6 +25,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
list (APPEND LEGACY_GUI_SOURCE_FILES ${LEGACY_GUI_MAC_SOURCE_FILES})
endif()
# Retrieve the absolute path to qmake and then use that path to find
# the binaries
get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
if (SYNERGY_ENTERPRISE)
list (REMOVE_ITEM LEGACY_GUI_SOURCE_FILES ${LEGACY_ACTIVATION_FILES})
list (REMOVE_ITEM LEGACY_GUI_UI_FILES ${LEGACY_ACTIVATION_FILES})
@ -77,6 +84,9 @@ endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
install (TARGETS synergy DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
install (CODE "MESSAGE (\"Running macdeployqt to install frameworks in bundle\")")
install (CODE "execute_process(COMMAND ${MACDEPLOYQT_EXECUTABLE}
${SYNERGY_BUNDLE_APP_DIR} -always-overwrite)")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
install (TARGETS synergy DESTINATION bin)
endif()