diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
| commit | b5eac2b2cec6919a57adc5dbf6dae39ce5525eff (patch) | |
| tree | 6ba958e0b0ab253cbf6193e11f5e36bcbc694622 /packaging/WiX/CPackWixConfig.cmake | |
| parent | 917c33cfbf7feade67ae4d4d884870e8f96f822e (diff) | |
| parent | e875a1d66b83b758c34d2190ffd180bd626327ea (diff) | |
| download | mariadb-git-b5eac2b2cec6919a57adc5dbf6dae39ce5525eff.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- scripts/CMakeLists.txt
Diffstat (limited to 'packaging/WiX/CPackWixConfig.cmake')
| -rw-r--r-- | packaging/WiX/CPackWixConfig.cmake | 7 |
1 files changed, 5 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")
|