MDEV233 - Support Wix3.6 for MSI

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{WIX}/bin"
 )
 
 SET(CPACK_WIX_PACKAGE_BASE_NAME "MariaDB")

win/packaging/ca/CMakeLists.txt

@@ -22,28 +22,40 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql)
 
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET(WIX_ARCH_SUFFIX "_x64")
+  SET(WIX36_ARCH_SUFFIX "x64")
 ELSE()
   SET(WIX_ARCH_SUFFIX)
+  SET(WIX36_ARCH_SUFFIX "x86")
 ENDIF()
 
 IF(MSVC_VERSION EQUAL 1400)
   SET(WIX35_MSVC_SUFFIX "_2005")
 ELSEIF(MSVC_VERSION EQUAL 1500)
   SET(WIX35_MSVC_SUFFIX "_2008")
+  SET(WIX36_MSVC_SUFFIX "VS2008")
 ELSEIF(MSVC_VERSION EQUAL 1600)
   SET(WIX35_MSVC_SUFFIX "_2010")
+  SET(WIX36_MSVC_SUFFIX "VS2010")
 ELSE()
   # When next VS is out, add the correct version here
   MESSAGE(FATAL_ERROR "Unknown VS version")
 ENDIF()
+INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/inc)
 
 FIND_LIBRARY(WIX_WCAUTIL_LIBRARY 
   NAMES wcautil${WIX_ARCH_SUFFIX}  wcautil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX}
-  HINTS ${WIX_DIR}/../SDK/lib)
+  wcautil
+  PATHS 
+  ${WIX_DIR}/../SDK/lib 
+  ${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}
-  PATHS ${WIX_DIR}/../SDK/lib)
+  dutil
+  PATHS 
+  ${WIX_DIR}/../SDK/lib
+  ${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/lib/${WIX36_ARCH_SUFFIX}
+  )
 
 ADD_VERSION_INFO(wixca SHARED WIXCA_SOURCES)
 ADD_LIBRARY(wixca SHARED EXCLUDE_FROM_ALL ${WIXCA_SOURCES})