diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-07-28 16:51:36 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-29 02:58:39 +0000 |
| commit | 191f9bdbc50bd3993259d31dfeeaa95187984fed (patch) | |
| tree | cf8572072b66d49166e524c25e224ce6e121ecd4 | |
| parent | 0b9f2fca533b9330dff9a99c999017c0e6ee8bfa (diff) | |
| download | wireshark-191f9bdbc50bd3993259d31dfeeaa95187984fed.tar.gz wireshark-191f9bdbc50bd3993259d31dfeeaa95187984fed.tar.bz2 wireshark-191f9bdbc50bd3993259d31dfeeaa95187984fed.zip | |
Give the WiX installer a full name.
Append the platform and version to the WiX installer name similar to
our other installers.
Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42
Reviewed-on: https://code.wireshark.org/review/16757
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 065e279aa6..822023d9a5 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -308,8 +308,9 @@ set(WIX_CANDLE_DEFINES PARENT_SCOPE ) +# The NSIS CMakeFile sets the program name + version slightly differently. set(WIX_LIGHT_DEFINES - -out ${CMAKE_CURRENT_BINARY_DIR}/Wireshark.msi + -out ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${WIRESHARK_TARGET_PLATFORM}-${PROJECT_VERSION}.msi -sw1076 -ext WixUIExtension PARENT_SCOPE |