From 4ace7ce80dc11010f78202ab742f749f85cbdd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=94=D0=BE=D0=BD=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Wed, 30 Nov 2016 02:11:06 +0300 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice --- CMakeLists.txt | 2 +- packaging/nsis/CMakeLists.txt | 2 +- packaging/wix/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60b2c12f51..b0a2d8fd86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2008,7 +2008,7 @@ if(BUILD_wireshark AND QT_FOUND) # be smart enough to copy debug DLLs when needed. add_custom_command(TARGET copy_qt_dlls POST_BUILD - COMMAND set "PATH=%PATH%;${QT_BIN_PATH}" + COMMAND set "PATH=${QT_BIN_PATH};%PATH%" COMMAND "${QT_WINDEPLOYQT_EXECUTABLE}" $<$:--debug> $<$>:--release> 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 $ -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 $ -FilePath ${_wix_binary_dir}/QtDependentComponents.wxs -- cgit v1.2.1