diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-07-28 00:01:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-01 17:48:41 +0200 |
| commit | 9cb8cff312ffd56de0ff17d7567c7975d9e3bf12 (patch) | |
| tree | 0d5dcf1ae08d5e51af64036a29143f8964cccf12 /win | |
| parent | 4188ba9c1e0ea195adf00d9e6d11b29ef18b2109 (diff) | |
| download | mariadb-git-9cb8cff312ffd56de0ff17d7567c7975d9e3bf12.tar.gz | |
MDEV-8296 MSVS 2013 & WiX 3.9
Support for VS2013 and WiX 3.9
(patch by Andrey Kuznetsov)
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | win/packaging/ca/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index 95547ac9f3a..3b9b72f48fd 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -24,6 +24,7 @@ FIND_PATH(WIX_DIR heat.exe "$ENV{ProgramFiles}/Windows Installer XML v3/bin" "$ENV{ProgramFiles}/Windows Installer XML v3.5/bin" "$ENV{ProgramFiles}/Windows Installer XML v3.6/bin" + "$ENV{ProgramFiles}/WiX Toolset v3.9/bin" "$ENV{WIX}/bin" ) diff --git a/win/packaging/ca/CMakeLists.txt b/win/packaging/ca/CMakeLists.txt index 0da1e5d67b1..ccd03130d69 100644 --- a/win/packaging/ca/CMakeLists.txt +++ b/win/packaging/ca/CMakeLists.txt @@ -36,6 +36,9 @@ ELSEIF(MSVC_VERSION EQUAL 1500) ELSEIF(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1700 ) SET(WIX35_MSVC_SUFFIX "_2010") SET(WIX36_MSVC_SUFFIX "VS2010") +ELSEIF(MSVC_VERSION EQUAL 1800 OR MSVC_VERSION EQUAL 1900 ) + SET(WIX35_MSVC_SUFFIX "_2013") + SET(WIX36_MSVC_SUFFIX "VS2013") ELSE() # When next VS is out, add the correct version here MESSAGE(FATAL_ERROR "Unknown VS version") @@ -47,7 +50,8 @@ FIND_LIBRARY(WIX_WCAUTIL_LIBRARY wcautil PATHS ${WIX_DIR}/../SDK/lib - ${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/lib/${WIX36_ARCH_SUFFIX}) + ${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/lib/${WIX36_ARCH_SUFFIX} + ) FIND_LIBRARY(WIX_DUTIL_LIBRARY NAMES dutil${WIX_ARCH_SUFFIX} dutil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} |