URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7d7fb7cb6d9ed1d509c0b73e380f7e7dc9e13ed7
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark
Commits:
7d7fb7c by Guy Harris (guy@xxxxxxxxxxxx):
Don't allow NSIS or WiX installers if we aren't building Wireshark.
In both cases, a file used in the process of building the installer is
generated from the Wireshark binary, so, unless we also arrange not to
put that file in the installer if Wireshark isn't being built, we can't
build the installer.
Have ADD_NSIS_PACKAGE_TARGET and ADD_WIX_PACKAGE_TARGET check whether
we're building Wireshark and fail if we aren't. That way, *if* we're
including the NSIS or WiX packages in the build files, we fail if we
aren't building Wireshark.
Change-Id: Icfe4d2491bd721cdd5fef424e9a7565c4990defa
Reviewed-on: https://code.wireshark.org/review/32053
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit 7770ad93e27519fd3fb56d88cc51a8dfc729799a)
Reviewed-on: https://code.wireshark.org/review/32055
Actions performed:
from d107755 Don't bother with BUILD_wireshark_gtk vs. not BUILD_wireshark_gtk.
add 7d7fb7c Don't allow NSIS or WiX installers if we aren't building Wireshark.
Summary of changes:
packaging/nsis/CMakeLists.txt | 11 +++++++++++
packaging/wix/CMakeLists.txt | 11 +++++++++++
2 files changed, 22 insertions(+)