aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-06-07 12:37:44 -0700
committerGerald Combs <gerald@wireshark.org>2017-06-07 19:45:37 +0000
commitf5dd12d71e8a3210bdb46d209b00b3bc81353b9a (patch)
tree070777a2c4a47d1acc0d3751a92207bebf4c8f2a /packaging
parent8aa84c630e258654db4ca99b4eb6c1a1ac3bc8bd (diff)
WiX: Switch to Visual Studio 2015.
The Windows builders now use Visual Studio 2015. Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1 Reviewed-on: https://code.wireshark.org/review/22018 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1) Reviewed-on: https://code.wireshark.org/review/22019
Diffstat (limited to 'packaging')
-rw-r--r--packaging/wix/CMakeLists.txt6
-rw-r--r--packaging/wix/InputPaths.wxi2
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 9baa2e7..835112d 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -101,9 +101,9 @@ set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_
set (VERSION "${PROJECT_VERSION}")
set (PRODUCT_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUILD})
-# Use the merge module that comes with Visual Studio (From MSVC 2013?)
-# This is currently hardcoded for MSVC 2013
-set (MSVC_CRT_VERSION "VC120")
+# Use the merge module that comes with Visual Studio (From MSVC 2015?)
+# This is currently hardcoded for MSVC 2015
+set (MSVC_CRT_VERSION "VC140")
set (MSVC_REDIST_DIR "$ENV{PROGRAMFILES}/Common Files/Merge Modules")
message(STATUS "Using ${MSVC_REDIST_DIR}/Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm for the installer")
diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi
index c858631..1b7d016 100644
--- a/packaging/wix/InputPaths.wxi
+++ b/packaging/wix/InputPaths.wxi
@@ -7,7 +7,7 @@
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?endif?>
- <?define VCRedist.Version = "VC120" ?>
+ <?define VCRedist.Version = "VC140" ?>
<?define VCRedist.Dir ="C:\Program Files (x86)\Common Files\Merge Modules\" ?>
<?define Staging.Dir ="$(var.BuildOutputDir)" ?>