From f5dd12d71e8a3210bdb46d209b00b3bc81353b9a Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 7 Jun 2017 12:37:44 -0700 Subject: 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 (cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1) Reviewed-on: https://code.wireshark.org/review/22019 --- packaging/wix/CMakeLists.txt | 6 +++--- packaging/wix/InputPaths.wxi | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packaging') diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 9baa2e7de4..835112dc17 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 c85863162a..1b7d016250 100644 --- a/packaging/wix/InputPaths.wxi +++ b/packaging/wix/InputPaths.wxi @@ -7,7 +7,7 @@ - + -- cgit v1.2.1