@@ -83,20 +83,35 @@ if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Release")
8383 get_target_property (_qt_qmake_executable Qt6::qmake IMPORTED_LOCATION )
8484 get_filename_component (_qt_bin_dir "${_qt_qmake_executable} " DIRECTORY )
8585 find_program (WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir} " )
86+
8687 if (WINDEPLOYQT_EXECUTABLE)
8788 set (_deploy_dir "${CMAKE_SOURCE_DIR} /release" )
89+
8890 add_custom_command (TARGET ${TARGET_NAME} POST_BUILD
91+ COMMAND "${CMAKE_COMMAND} " -E remove_directory "${_deploy_dir} "
8992 COMMAND "${CMAKE_COMMAND} " -E make_directory "${_deploy_dir} "
90- COMMAND "${CMAKE_COMMAND} " -E copy "$<TARGET_FILE: ${TARGET_NAME} >" " ${_deploy_dir} /$<TARGET_FILE_NAME: ${TARGET_NAME} >"
91- COMMAND " ${WINDEPLOYQT_EXECUTABLE} "
93+ COMMAND "${CMAKE_COMMAND} " -E copy
94+ "$<TARGET_FILE: ${TARGET_NAME} > "
9295 "${_deploy_dir} /$<TARGET_FILE_NAME:${TARGET_NAME} >"
96+
97+ COMMAND "${WINDEPLOYQT_EXECUTABLE} "
98+ --release
9399 --qmldir "${CMAKE_SOURCE_DIR} /qml"
94- --no -compiler-runtime
95100 --no -translations
96101 --no -system -d3d-compiler
97102 --no -opengl-sw
98- COMMAND cmd /c if exist "${CMAKE_SOURCE_DIR} /installer/clean_release.bat" call "${CMAKE_SOURCE_DIR} /installer/clean_release.bat" "${_deploy_dir} "
99- COMMAND cmd /c if exist "${CMAKE_SOURCE_DIR} /installer/user_post_deploy.bat" call "${CMAKE_SOURCE_DIR} /installer/user_post_deploy.bat" "${_deploy_dir} " "${PROJECT_VERSION} "
103+ --skip-plugin-types qmltooling,generic
104+ "${_deploy_dir} /$<TARGET_FILE_NAME:${TARGET_NAME} >"
105+
106+ COMMAND cmd /c if exist
107+ "${CMAKE_SOURCE_DIR} /installer/clean_release.bat"
108+ call "${CMAKE_SOURCE_DIR} /installer/clean_release.bat" "${_deploy_dir} "
109+
110+ COMMAND cmd /c if exist
111+ "${CMAKE_SOURCE_DIR} /installer/user_post_deploy.bat"
112+ call "${CMAKE_SOURCE_DIR} /installer/user_post_deploy.bat"
113+ "${_deploy_dir} " "${PROJECT_VERSION} "
114+
100115 COMMENT "Running windeployqt for ${TARGET_NAME} (release folder)"
101116 )
102117 else ()
0 commit comments