diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/wix/InputPaths.wxi | 2 |
2 files changed, 4 insertions, 4 deletions
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 @@ <?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)" ?> |