osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Gerald Combs 2017-06-07 12:37:44 -07:00
parent 8aa84c630e
commit f5dd12d71e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/wix/CMakeLists.txt
View File

@ -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")

2
packaging/wix/InputPaths.wxi
View File

@ -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)" ?>