diff options
| author | tobtoht <tob@featherwallet.org> | 2026-01-29 15:37:52 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2026-01-29 15:37:52 +0000 |
| commit | d3559a40baf439d4677831c08a3c3a8a5d932111 (patch) | |
| tree | aac21baeaab4197c3532b28148c5e0cd8309a634 | |
| parent | c5e0680bdf6914734bbee2427d6915f63f1bf532 (diff) | |
| parent | dfe7f302d4611e93692fdaee0799b2f8f377268f (diff) | |
| download | monzero-gui-d3559a40baf439d4677831c08a3c3a8a5d932111.tar.gz monzero-gui-d3559a40baf439d4677831c08a3c3a8a5d932111.tar.xz monzero-gui-d3559a40baf439d4677831c08a3c3a8a5d932111.zip | |
Merge pull request #4551
dfe7f30 cmake: warn if qmake has -qt5 suffix during deploy (selsta)
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | cmake/Deploy.cmake | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67bfdc17..e183613f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,6 +59,10 @@ jobs: with: update: true install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-pcre mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-angleproject + - name: add qmake.exe and windeployqt.exe + run: | + cp -f "$MSYSTEM_PREFIX/bin/qmake-qt5.exe" "$MSYSTEM_PREFIX/bin/qmake.exe" + cp -f "$MSYSTEM_PREFIX/bin/windeployqt-qt5.exe" "$MSYSTEM_PREFIX/bin/windeployqt.exe" - name: build run: DEV_MODE=ON make release-win64 -j2 - name: deploy 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}" "$<TARGET_FILE:monero-wallet-gui>" -no-translations -qmldir="${CMAKE_SOURCE_DIR}" COMMENT "Running windeployqt..." ) |