summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--packaging/nsis/CMakeLists.txt2
-rw-r--r--packaging/wix/CMakeLists.txt2
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}"
$<$<CONFIG:Debug>:--debug>
$<$<NOT:$<CONFIG: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 $<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