diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-03-01 13:25:59 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-03-01 13:25:59 +0100 |
| commit | 6ff9305f967deed15c78884827ce0780e7267f22 (patch) | |
| tree | 34f72eaf0e322b86ab08ed89e1a40bececa3fca8 /cmake | |
| parent | da6538b6cb28fb602bf56ca46132838dbc088e7f (diff) | |
| download | mariadb-git-6ff9305f967deed15c78884827ce0780e7267f22.tar.gz | |
Bug#11765489 CMAKE BUILD ON MAC OS X DOES NOT DETERMINE CPU TYPE
Don't use CMAKE_OSX_ARCHITECTURES to determine DEFAULT_MACHINE
if it is not defined.
If we're 64bit, then use "x86_64" rather than "x86"
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/package_name.cmake | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index 28f89895f2d..1566117cb60 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -83,12 +83,20 @@ IF(NOT VERSION) MATH(EXPR VER "${VER} -4") SET(DEFAULT_PLATFORM "osx10.${VER}") ENDIF() - LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN) - IF(LEN GREATER 1) - SET(DEFAULT_MACHINE "universal") + + IF(CMAKE_OSX_ARCHITECTURES) + LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN) + IF(LEN GREATER 1) + SET(DEFAULT_MACHINE "universal") + ELSE() + SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}") + ENDIF() ELSE() - SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}") + IF(64BIT) + SET(DEFAULT_MACHINE "x86_64") + ENDIF() ENDIF() + IF(DEFAULT_MACHINE MATCHES "i386") SET(DEFAULT_MACHINE "x86") ENDIF() |