Manual merge from mysql-trunk.

Conflicts:
  - scripts/CMakeLists.txt

2 files changed, 6 insertions, 2 deletions

diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake
index 6fdc5b46f9a..0413b699fc5 100644
--- a/packaging/WiX/CPackWixConfig.cmake
+++ b/packaging/WiX/CPackWixConfig.cmake
@@ -3,8 +3,11 @@ IF(ESSENTIALS)
  MESSAGE("Essentials!")

  SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")

  SET(CPACK_WIX_UI "WixUI_InstallDir")

- MATH(EXPR bits ${CMAKE_SIZEOF_VOID_P}*8)

- SET(CPACK_PACKAGE_FILE_NAME  "mysql-essentials-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH}-win${bits}")

+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)

+  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-winx64")

+ ELSE()

+  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-win32")

+ ENDIF()

 ELSE()

   SET(CPACK_COMPONENTS_USED 

     "Server;Client;DataFiles;Development;SharedLibraries;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")

diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index ff18009fd0c..d6725e9ae6c 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -4,6 +4,7 @@ SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
 SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@")

 SET(CMAKE_COMMAND "@CMAKE_COMMAND@")

 SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")

+SET(VERSION "@VERSION@")

 SET(MAJOR_VERSION "@MAJOR_VERSION@")

 SET(MINOR_VERSION "@MINOR_VERSION@")

 SET(PATCH "@PATCH@")