diff options
| author | sunanda.menon@sun.com <> | 2010-07-19 12:10:01 +0200 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2010-07-19 12:10:01 +0200 |
| commit | 226852ea145c39543926171cd5f1eadc5deca356 (patch) | |
| tree | 387c5b8d05e116f535eb584bfd65368e7cb432d1 /packaging | |
| parent | e0aba0c84b920dab5d8f726d3fc1c96f8d476a50 (diff) | |
| parent | 60a9dfbb3ce7f7dfde8e85b8394d32872daf92f9 (diff) | |
| download | mariadb-git-226852ea145c39543926171cd5f1eadc5deca356.tar.gz | |
Merge from mysql-5.5.5-m3-release
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/WiX/CPackWixConfig.cmake | 7 | ||||
| -rw-r--r-- | packaging/WiX/create_msi.cmake.in | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake index 9577574bbaf..b1dfe76fdea 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")
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@")
|