diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-11-28 17:08:27 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-30 06:12:23 +0000 |
| commit | 2bcc8dbf267bb33aae5c62d93653b0e1d3105a1b (patch) | |
| tree | 485d43691dfa705e990476c0139a5fb63f76f29f /packaging/wix/CMakeLists.txt | |
| parent | 1bab83de53995d87c6032cc4872dbc7be2c04cca (diff) | |
NSIS: Install NPcap instead of WinPcap.
Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update
and/or remove installer text, variables, and variable names accordingly.
Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f
Reviewed-on: https://code.wireshark.org/review/30829
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/wix/CMakeLists.txt')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 508b86275d..ec4bf067d7 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -67,17 +67,6 @@ else() message(FATAL_ERROR "Your mysterious moon-man architecture \"${WIRESHARK_TARGET_PLATFORM}\" frightens and confuses us.") endif() -# Path to the WinPcap installer. -# XXX Come up with a better variable, e.g. cache WIRESHARK_LIB_DIR in FindWSWinLibs. -file(TO_NATIVE_PATH "${GLIB2_DLL_DIR}/../.." _wireshark_lib_dir) -set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}") - -# Must match ${WIRESHARK_LIB_DIR}/WinPcap_X_Y_Z.exe -set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION}) -string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}") - -set(USBPCAP_DISPLAY_VERSION "1.2.0.4") - set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) # To do: |