Skip to content

Commit

Permalink
Make windeployqt invocation work on latest Qt
Browse files Browse the repository at this point in the history
--no-declarative and --no-winextras are no more recognised.

It went unnoticed when releasing 0.0.96 because windeployqt failures
caused CMake warnings rather than fatal stops. This has changed now:
from now on, installation on Windows will fail if windeployqt fails.
  • Loading branch information
KitsuneRal committed Feb 18, 2024
1 parent 293c13d commit 4c53d18
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,13 @@ if(WIN32)
message(STATUS \"Running windeployqt at \${CMAKE_INSTALL_PREFIX}\${CMAKE_INSTALL_BINDIR}\")
execute_process(
COMMAND \"${${Qt}_BinDir}/windeployqt\" --verbose ${DEPLOY_VERBOSITY}
--no-multimediaquick --no-declarative --no-test --no-winextras
--no-multimediaquick --no-test
--qmldir \"${QML_DIR}\"
\${CMAKE_INSTALL_PREFIX}\${CMAKE_INSTALL_BINDIR}
RESULT_VARIABLE WDQ_RETVAL
)
if (WDQ_RETVAL)
message(WARNING \"windeployqt returned \${WDQ_RETVAL} - check messages above\")
message(FATAL_ERROR \"windeployqt returned \${WDQ_RETVAL} - check messages above\")
else()
message(STATUS \"Quaternion and its dependencies have been deployed to \${CMAKE_INSTALL_PREFIX}.\")
endif()
Expand Down

0 comments on commit 4c53d18

Please sign in to comment.