diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2012-03-22 16:16:11 +0100 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2012-03-22 16:16:11 +0100 |
commit | 26c08ffa405224ced8540d794981bd947fd39168 (patch) | |
tree | d5bb50905946af96419320eb118ac27d577019f4 /cmake/package_name.cmake | |
parent | faa5e844bb3b0327e7072230719a36dd58a29bfd (diff) | |
download | mariadb-git-26c08ffa405224ced8540d794981bd947fd39168.tar.gz |
Merged some fixes from 7.2 release branches
Diffstat (limited to 'cmake/package_name.cmake')
-rw-r--r-- | cmake/package_name.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index fb75df563ec..d9e0902c921 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -116,8 +116,15 @@ IF(NOT VERSION) SET(PRODUCT_TAG) ENDIF() - SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}") - + IF("${VERSION}" MATCHES "-ndb-") + STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}") + SET(package_name "mysql-cluster${PRODUCT_TAG}-${NDBVERSION}-${SYSTEM_NAME_AND_PROCESSOR}") + ELSE() + SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}") + ENDIF() + + MESSAGE("-- Packaging as: ${package_name}") + # Sometimes package suffix is added (something like "-icc-glibc23") IF(PACKAGE_SUFFIX) SET(package_name "${package_name}${PACKAGE_SUFFIX}") |