aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/CMakeLists.txt11
-rw-r--r--packaging/wix/CMakeLists.txt11
2 files changed, 22 insertions, 0 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index 1439de94ff..47bf0dc093 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -189,6 +189,17 @@ macro( ADD_NSIS_PACKAGE_TARGET )
#set (_nsis_package ${CMAKE_BINARY_DIR}/packaging/nsis/Wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe)
# qt-dll-manifest.nsh. Created using Wireshark.exe.
+ #
+ # XXX - if we're not building Wireshark, we can't build this
+ # manifest. On the other hand, if we're not building
+ # Wireshark, we have no need to include Qt in the installer,
+ # so it's not clear we need this manifest.
+ #
+ # This should probably be fixed, so that people can produce
+ # command-line-only installer packages.
+ if(NOT BUILD_wireshark)
+ message(FATAL_ERROR "The NSIS installer cannot be built if the Wireshark program isn't built.")
+ endif()
add_custom_command(OUTPUT ${_nsis_binary_dir}/qt-dll-manifest.nsh
COMMAND set "PATH=${QT_BIN_PATH};%PATH%"
COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/windeployqt-to-nsis.ps1"
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 7011f0f7ef..d1db7c2bdf 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -221,6 +221,17 @@ macro( ADD_WIX_PACKAGE_TARGET )
set (_wix_binary_dir ${CMAKE_BINARY_DIR}/packaging/wix )
# QtDependentComponents.wxs. Created using Wireshark.exe.
+ #
+ # XXX - if we're not building Wireshark, we can't build this
+ # manifest. On the other hand, if we're not building
+ # Wireshark, we have no need to include Qt in the installer,
+ # so it's not clear we need this manifest.
+ #
+ # This should probably be fixed, so that people can produce
+ # command-line-only installer packages.
+ if(NOT BUILD_wireshark)
+ message(FATAL_ERROR "The WiX installer cannot be built if the Wireshark program isn't built.")
+ endif()
add_custom_command(OUTPUT ${_wix_binary_dir}/QtDependentComponents.wxs
COMMAND set "PATH=${QT_BIN_PATH};%PATH%"
COMMAND ${POWERSHELL_COMMAND} "${_wix_source_dir}/windeployqt-to-wix.ps1"