From dfe7f302d4611e93692fdaee0799b2f8f377268f Mon Sep 17 00:00:00 2001 From: selsta Date: Thu, 15 Jan 2026 20:29:04 +0100 Subject: cmake: warn if qmake has -qt5 suffix during deploy Also make sure that windeployqt only runs when make deploy is executed. --- cmake/Deploy.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/Deploy.cmake b/cmake/Deploy.cmake index 9a6efd93..e5f147f6 100644 --- a/cmake/Deploy.cmake +++ b/cmake/Deploy.cmake @@ -51,8 +51,12 @@ if(APPLE OR (WIN32 AND NOT STATIC)) endif() elseif(WIN32) + find_program(QMAKE_EXECUTABLE qmake HINTS "${_qt_bin_dir}") find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}") - add_custom_command(TARGET monero-wallet-gui POST_BUILD + if(NOT QMAKE_EXECUTABLE OR NOT WINDEPLOYQT_EXECUTABLE) + message(WARNING "Deploy requires qmake.exe and windeployqt.exe (no -qt5 suffix) in ${_qt_bin_dir}") + endif() + add_custom_command(TARGET deploy POST_BUILD COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" "$" -no-translations -qmldir="${CMAKE_SOURCE_DIR}" COMMENT "Running windeployqt..." ) -- cgit v1.2.3