diff options
| author | Роман Донченко <dpb@corrigendum.ru> | 2016-11-30 02:11:06 +0300 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2016-11-30 11:44:41 +0000 |
| commit | 4ace7ce80dc11010f78202ab742f749f85cbdd6b (patch) | |
| tree | 5e702b09d43b5c56feeb7977b0751dd839d8b439 /packaging | |
| parent | 7fe45cc0ec4e8bc1c3d5cd27c98feb8ecbb2b1b4 (diff) | |
| download | wireshark-4ace7ce80dc11010f78202ab742f749f85cbdd6b.tar.gz | |
Fix the build when a different version of Qt is in PATH
When we add our Qt to PATH, prepend it so that it will be found first.
Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9
Reviewed-on: https://code.wireshark.org/review/18988
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 1fe07dfd1d..3406afe4a8 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -196,7 +196,7 @@ macro( ADD_NSIS_PACKAGE_TARGET ) # qt-dll-manifest.nsh. Created using Wireshark.exe. add_custom_command(OUTPUT ${_nsis_binary_dir}/qt-dll-manifest.nsh - COMMAND set "PATH=%PATH%;${QT_BIN_PATH}" + COMMAND set "PATH=${QT_BIN_PATH};%PATH%" COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/windeployqt-to-nsis.ps1" -Executable $<TARGET_FILE:wireshark> -FilePath ${_nsis_binary_dir}/qt-dll-manifest.nsh diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 56893a78fd..2cc5ea7f41 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -334,7 +334,7 @@ macro( ADD_WIX_PACKAGE_TARGET ) # QtDependentComponents.wxs. Created using Wireshark.exe. add_custom_command(OUTPUT ${_wix_binary_dir}/QtDependentComponents.wxs - COMMAND set "PATH=%PATH%;${QT_BIN_PATH}" + COMMAND set "PATH=${QT_BIN_PATH};%PATH%" COMMAND ${POWERSHELL_COMMAND} "${_wix_source_dir}/windeployqt-to-wix.ps1" -Executable $<TARGET_FILE:wireshark> -FilePath ${_wix_binary_dir}/QtDependentComponents.wxs |