diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-06-29 14:18:34 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-06-29 14:18:34 +0100 |
| commit | ac854b73cfecc31ff571bd854cce8e3664722544 (patch) | |
| tree | 8d2912d915d054f918d733eaedc45a55fac1d7ec /packaging/WiX | |
| parent | 17dea3142cc6c8761350aaf4c1db7e7535971c20 (diff) | |
| download | mariadb-git-ac854b73cfecc31ff571bd854cce8e3664722544.tar.gz | |
Fix x64 package name.
Diffstat (limited to 'packaging/WiX')
| -rw-r--r-- | packaging/WiX/CPackWixConfig.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake index 363c9abf047..098eb0bb040 100644 --- a/packaging/WiX/CPackWixConfig.cmake +++ b/packaging/WiX/CPackWixConfig.cmake @@ -4,7 +4,11 @@ IF(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-essential-${VERSION}-win${bits}")
+ IF(64BIT)
+ 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")
|