summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-08-25 07:28:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-08-25 07:28:04 +0300
commit9f8871db2f0bcf27b05e6be34c262173b8026c80 (patch)
tree8ce3638437cd82a3f78f79e44880684f0a00a662
parent497b69493620eaa4cb1f2240a10be85e08a59793 (diff)
parentece30d47ca939944cdbb5bd2c12193c3c750fd01 (diff)
downloadmariadb-git-9f8871db2f0bcf27b05e6be34c262173b8026c80.tar.gz
Merge 10.2 into 10.3
-rw-r--r--cmake/package_name.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index d14bf1f526e..ce13a446fe6 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -110,7 +110,11 @@ IF(NOT VERSION)
SET(DEFAULT_MACHINE "x86")
ENDIF()
ENDIF()
-
+
+ IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
+ SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
+ ENDIF()
+
IF(NOT PLATFORM)
SET(PLATFORM ${DEFAULT_PLATFORM})
ENDIF()