From 329afb47be55d956e3dab6e8911fa229952cc1f3 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 3 Jan 2025 10:36:28 -0500 Subject: [PATCH] build: windeployqt only on package dir --- deploy/windows/deploy.cmake | 6 ++++++ src/apps/deskflow-gui/CMakeLists.txt | 11 ----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/deploy/windows/deploy.cmake b/deploy/windows/deploy.cmake index 5575e9de2..7e3311816 100644 --- a/deploy/windows/deploy.cmake +++ b/deploy/windows/deploy.cmake @@ -12,6 +12,12 @@ configure_file( ${PROJECT_BINARY_DIR}/src/version.rc @ONLY ) +# Install Qt Depends to stage +find_program(DEPLOYQT windeployqt6) +install(CODE "execute_process( + COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network \"\${CMAKE_INSTALL_PREFIX}/deskflow.exe\" +)") + # Setup OS_STRING if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64) set(OS_STRING "win-x64") diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt index 5fd80f797..8e1765340 100644 --- a/src/apps/deskflow-gui/CMakeLists.txt +++ b/src/apps/deskflow-gui/CMakeLists.txt @@ -76,17 +76,6 @@ if(WIN32) ".*system32.*" RUNTIME DESTINATION . ) - find_program(DEPLOYQT windeployqt6) - add_custom_command( - TARGET ${target} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/qtDeploy - COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network --dir ${CMAKE_BINARY_DIR}/qtDeploy $ - ) - install( - DIRECTORY ${CMAKE_BINARY_DIR}/qtDeploy/ - DESTINATION . - FILES_MATCHING PATTERN "*.*" - ) elseif(APPLE) set_target_properties(${target} PROPERTIES INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"