MDEV-8296 MSVS 2013 & WiX 3.9

Support for VS2013 and WiX 3.9 (patch by Andrey Kuznetsov)
MariaDB · Aug 1, 2015 · 9cb8cff · 9cb8cff
1 parent 4188ba9
commit 9cb8cff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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}