From 191f9bdbc50bd3993259d31dfeeaa95187984fed Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 28 Jul 2016 16:51:36 -0700
Subject: 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>
---
 packaging/wix/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packaging/wix')

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
-- 
cgit v1.2.3