summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-06-29 14:18:34 +0100
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-06-29 14:18:34 +0100
commit855beb8bf338172176a645d9c266f30cd8ad64c0 (patch)
tree8d2912d915d054f918d733eaedc45a55fac1d7ec /packaging
parent1560a4767e868c4ed42b528d4a73e12b085ccc6a (diff)
downloadmariadb-git-855beb8bf338172176a645d9c266f30cd8ad64c0.tar.gz
Fix x64 package name.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/WiX/CPackWixConfig.cmake6
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")