osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/cmake/modules
History
Michael Mann c34996f970 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>
 		2016-05-11 13:09:17 +00:00
..
CMakeInstallDirs.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
COPYING-CMAKE-SCRIPTS Continue to remove $Id$ from top of file 2014-03-31 16:00:04 +00:00
CheckCCompilerFlag.cmake Revert "Another message from Clang for unknown -f and -m flags." 2015-10-14 16:53:36 +00:00
CheckCLinkerFlag.cmake Get Clang to report errors for unused vs. unknown linker flags 2016-01-28 02:44:14 +00:00
CheckCXXCompilerFlag.cmake Duplicate CheckCCompilerFlag for CXX. 2015-07-08 07:16:01 +00:00
FindAIRPCAP.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindASCIIDOC.cmake Fix CMake target FOLDER properties 2016-03-20 14:03:12 +00:00
FindCAP.cmake cmake: use pkg-config for resolving dependencies 2014-10-01 08:14:34 +00:00
FindCARES.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindChocolatey.cmake Win flex-bison and Chocolatey updates. 2014-08-07 21:54:54 +00:00
FindCygwin.cmake CMake: Add "C:/tools/cygwin" to FindCygwin.cmake. 2015-11-17 01:37:00 +00:00
FindDOXYGEN.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindFOP.cmake Add missing hints. 2016-03-02 18:57:31 +00:00
FindFreetype.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindGCRYPT.cmake Require libgcrypt 1.4.2, add cmake version detection 2015-10-20 03:28:55 +00:00
FindGEOIP.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindGLIB2.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindGMODULE2.cmake Detecting gmodule2 on Homebrew almost worked... it behaves more like 2014-06-16 18:32:26 +00:00
FindGNUTLS.cmake Require GnuTLS 2.12.0, add cmake version detection 2015-10-25 14:05:07 +00:00
FindGTHREAD2.cmake CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows. 2014-10-20 23:42:11 +00:00
FindGTK2.cmake CMake: Copy wireshark-gtk dependent DLLs to the target directory. 2015-01-14 17:32:15 +00:00
FindGTK3.cmake cmake: fix GTK3 detection via pkg-config 2016-05-09 20:01:20 +00:00
FindKERBEROS.cmake cmake: fix kerberos library lookup, support Heimdal 2015-10-13 07:36:30 +00:00
FindLEX.cmake Add checkAPI calls to CMake. 2016-05-02 12:01:24 +00:00
FindLIBSSH.cmake Compile sshdump and ciscodump for Windows 2016-04-25 07:22:28 +00:00
FindLUA.cmake FindLUA.cmake: reject version 5.3 2015-11-15 20:15:41 +00:00
FindLYNX.cmake Always use html2text.py for FAQ, improve output 2015-03-25 07:08:52 +00:00
FindM.cmake Fix a problem that causes build failures with CMake on Yosemite. 2014-11-11 03:48:56 +00:00
FindMSVC_REDIST.cmake CMake+PortableApps: Include the VC runtime (second try). 2015-12-04 22:32:32 +00:00
FindNL.cmake cmake: use pkg-config for resolving dependencies 2014-10-01 08:14:34 +00:00
FindNSIS.cmake CMake+PortableApps: Include the VC runtime (second try). 2015-12-04 22:32:32 +00:00
FindOS_X_FRAMEWORKS.cmake Fix OS X CMake build. 2014-06-24 07:10:12 +00:00
FindPCAP.cmake Move more capture device handling to the caputils library. 2016-01-07 04:38:39 +00:00
FindPOD.cmake FindPOD: fix link to CSS 2015-03-25 14:32:00 +00:00
FindPORTAUDIO.cmake Add PortAudio to Windows CMake build 2015-06-09 13:12:19 +00:00
FindPortableApps.cmake CMake: Initial PortableApps targets. 2015-04-14 19:11:50 +00:00
FindPowerShell.cmake Start moving win-setup to PowerShell. 2015-04-14 19:09:30 +00:00
FindSBC.cmake Add Bluetooth SBC Codec support in cmake 2014-02-17 21:44:17 +00:00
FindSED.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindSETCAP.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindSH.cmake Build: On Windows, ensure we have found Cygwin bash 2016-01-02 22:59:03 +00:00
FindSMI.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindWSWinLibs.cmake CMake updates for Windows build 2015-03-26 16:58:53 +00:00
FindWiX.cmake Create a Wix Installer 2016-05-11 13:09:17 +00:00
FindWinSparkle.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindWireshark.cmake Fix missing space 2014-12-17 15:29:18 +00:00
FindXSLTPROC.cmake DocBook: Don't require xmllint. 2016-03-18 23:26:51 +00:00
FindYACC.cmake Add checkAPI calls to CMake. 2016-05-02 12:01:24 +00:00
FindYAPP.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindZLIB.cmake CMake: Don't clobber ZLIB_*. 2015-10-06 21:41:25 +00:00
GenerateTestSh.cmake Fix the exec call and paths in the test wrapper. 2015-03-07 05:04:32 +00:00
LICENSE.txt Remove some $Id$ lines 2014-07-12 14:31:51 +00:00
LocatePythonExecutable.cmake Put a newline at the end of the file. 2015-11-03 01:46:41 +00:00
LocatePythonModule.cmake Fix Python 3 compatibility in LocatePythonModule 2014-12-21 08:54:24 +00:00
UseABICheck.cmake cmake: fix "multiple rules generate abi-descriptor.template" warning 2015-11-23 17:22:44 +00:00
UseAsn2Wrs.cmake CMake: Find asn2wrs.py once. 2016-03-24 18:41:39 +00:00
UseCheckAPI.cmake Add checkAPI calls to CMake. 2016-05-02 12:01:24 +00:00
UseCustomIncludes.cmake Having CmakeListsCustom.txt in git defeats the purpose of its existence: 2014-09-18 07:02:00 +00:00
UseLemon.cmake Add checkAPI calls to CMake. 2016-05-02 12:01:24 +00:00
UseMakeDissectorReg.cmake Use LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissectorReg.cmake more generally (out-of-source) usable. 2014-12-18 07:42:39 +00:00
UseMakeTapReg.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
UseWinLibs.cmake CMake: Fixup appending to WS_WIN_LIBS 2015-08-20 19:56:22 +00:00
WiresharkConfig.cmake.in Add Wireshark_LIBRARY variable 2014-12-16 16:04:55 +00:00
WiresharkConfigVersion.cmake.in Add cmake helper files for finding wireshark 2014-12-16 14:18:02 +00:00
WiresharkPlugin.cmake CPack: Fixup plugin paths on Windows. 2015-12-30 22:40:00 +00:00
gmxTestLargeFiles.cmake Copy over cmake largfile detection from the gromacs project. 2013-07-23 09:40:21 +00:00
hhc.cmake CMake: Migrate to hhc.cmake. 2015-01-09 17:49:37 +00:00
readme.txt More SVN properties cleanup. 2013-10-27 01:11:15 +00:00

readme.txt 

The following modules have been copied from CMake trunk _without_ modifications:

* FindZLIB.cmake