summaryrefslogtreecommitdiff
path: root/cmake/package_name.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake/package_name.cmake')
-rw-r--r--cmake/package_name.cmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index b027ac3901f..7d6e4d7348a 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -88,6 +88,13 @@ IF(NOT VERSION)
SET(DEFAULT_MACHINE "universal")
ELSE()
SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+ IF(NOT DEFAULT_MACHINE)
+ IF(CMAKE_SIZEOF_VOIPD EQUAL 4)
+ SET(DEFAULT_MACHINE "i386")
+ ELSE()
+ SET(DEFAULT_MACHINE "x86_64")
+ ENDIF()
+ ENDIF()
ENDIF()
IF(DEFAULT_MACHINE MATCHES "i386")
SET(DEFAULT_MACHINE "x86")
@@ -116,7 +123,7 @@ IF(NOT VERSION)
SET(PRODUCT_TAG)
ENDIF()
- SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
+ SET(package_name "mariadb${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
# Sometimes package suffix is added (something like "-icc-glibc23")
IF(PACKAGE_SUFFIX)