[Commits] Rev 3139: MDEV233 - Support Wix3.6 for MSI in file:///H:/bzr/5.2/

Vladislav Vaintroub wlad at montyprogram.com
Wed Apr 25 16:30:57 EEST 2012


At file:///H:/bzr/5.2/

------------------------------------------------------------
revno: 3139
revision-id: wlad at montyprogram.com-20120425133019-wbbbxfiyh0694s9u
parent: sergii at pisem.net-20120418180450-odt0cg39lxjhz9qu
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.2
timestamp: Wed 2012-04-25 15:30:19 +0200
message:
  MDEV233 - Support Wix3.6 for MSI
-------------- next part --------------
=== modified file 'win/packaging/CMakeLists.txt'
--- a/win/packaging/CMakeLists.txt	2011-06-08 14:56:35 +0000
+++ b/win/packaging/CMakeLists.txt	2012-04-25 13:30:19 +0000
@@ -24,6 +24,7 @@
   "$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")

=== modified file 'win/packaging/ca/CMakeLists.txt'
--- a/win/packaging/ca/CMakeLists.txt	2011-01-30 21:27:59 +0000
+++ b/win/packaging/ca/CMakeLists.txt	2012-04-25 13:30:19 +0000
@@ -22,28 +22,40 @@
 
 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})



More information about the commits mailing list