diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-04-07 19:03:51 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-11 13:09:17 +0000 |
| commit | c34996f970ab003bb8566825b38834de00f5159e (patch) | |
| tree | fda0c581d87baf3cb0264affaaeb861354f66311 /cmake | |
| parent | 980f58bc277df178a15b4c730fb1b0cbd462da0b (diff) | |
Create a Wix Installer
This is intended to replace the NSIS installer for Windows.
It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together)
TODO:
1. Customize installer with Wireshark graphics
2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake.
3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns.
4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility.
Many thanks to Brian Pratt for all the Wix help.
Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c
Reviewed-on: https://code.wireshark.org/review/14858
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindWiX.cmake | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/cmake/modules/FindWiX.cmake b/cmake/modules/FindWiX.cmake new file mode 100644 index 0000000000..f10f225d84 --- /dev/null +++ b/cmake/modules/FindWiX.cmake @@ -0,0 +1,24 @@ +# +# - Find Wix executables +# Find the candle and light command +# +# MAKEWIX_EXECUTABLE - path to the candle utility. +# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS - System runtime DLLs + +# Find candle +find_program(WIX_CANDLE_EXECUTABLE candle + PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + DOC "Path to the WiX candle utility." +) + +# Find light +find_program(WIX_LIGHT_EXECUTABLE light + PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + DOC "Path to the WiX light utility." +) + +# Find light +find_program(WIX_HEAT_EXECUTABLE heat + PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + DOC "Path to the WiX heat utility." +) |