diff options
| author | João Valverde <j@v6e.pt> | 2023-05-31 07:41:09 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-05-31 08:03:37 +0000 |
| commit | 42d7a9fa403e1e137fbf9ed39d53e16e2ba7666d (patch) | |
| tree | 704ea3dba84b9669fffd34240c92906e17689983 /packaging/nsis | |
| parent | ec2ca05e15430b055d52ce69355528d8a1c1ff07 (diff) | |
CMake: Remove duplicate npcap/usbpcap version vars
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | packaging/nsis/wireshark-config.nsh.in | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 7a11d99d31..e2daec6586 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -59,11 +59,6 @@ file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}" TOP_SRC_DIR) file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/docbook" DOCBOOK_DIR) set (MMDBRESOLVE_EXE ${MAXMINDDB_FOUND}) -# Must match tools/win-setup.ps1. -set(NPCAP_PACKAGE_VERSION "1.75") - -set(USBPCAP_PACKAGE_VERSION "1.5.4.0") - # To do: # - Sync the various version names between CMake and NSIS. # - Set CMakeLists.txt version strings in tools/make-version.py diff --git a/packaging/nsis/wireshark-config.nsh.in b/packaging/nsis/wireshark-config.nsh.in index 6e19d1ae59..702ef53f8b 100644 --- a/packaging/nsis/wireshark-config.nsh.in +++ b/packaging/nsis/wireshark-config.nsh.in @@ -9,8 +9,8 @@ #define TOP_SRC_DIR "@TOP_SRC_DIR@" #define WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE @WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@ #define EXTRA_INSTALLER_DIR "@EXTRA_INSTALLER_DIR@" -#define NPCAP_PACKAGE_VERSION @NPCAP_PACKAGE_VERSION@ -#define USBPCAP_PACKAGE_VERSION @USBPCAP_PACKAGE_VERSION@ +#define NPCAP_PACKAGE_VERSION @NPCAP_VERSION@ +#define USBPCAP_PACKAGE_VERSION @USBPCAP_VERSION@ #define VERSION @PROJECT_VERSION@ #define MAJOR_VERSION @PROJECT_MAJOR_VERSION@ #define MINOR_VERSION @PROJECT_MINOR_VERSION@ |