summaryrefslogtreecommitdiff
path: root/configure.cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@macbook.local>2009-11-26 00:47:38 +0100
committerVladislav Vaintroub <vvaintroub@macbook.local>2009-11-26 00:47:38 +0100
commit3093ea058cd91811aee2853db1a444999ba30253 (patch)
tree558ac4878c2da54426a41b2f603003227aa1c5ff /configure.cmake
parentac0b20488e9445e805151815ff4173bf25049c91 (diff)
downloadmariadb-git-3093ea058cd91811aee2853db1a444999ba30253.tar.gz
Fix universal binaries build on OSX, in case both 32 and 64 bit architectures are used
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake
index 6c105c25f4a..efc94f09244 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -687,14 +687,17 @@ ENDIF()
IF(HAVE_STDINT_H)
SET(CMAKE_EXTRA_INCLUDE_FILES stdint.h)
ENDIF(HAVE_STDINT_H)
+
+IF(NOT APPLE)
+ CHECK_TYPE_SIZE("char *" SIZEOF_CHARP)
+ CHECK_TYPE_SIZE(long SIZEOF_LONG)
+ CHECK_TYPE_SIZE(size_t SIZEOF_SIZE_T)
+ENDIF()
CHECK_TYPE_SIZE(char SIZEOF_CHAR)
-CHECK_TYPE_SIZE("char *" SIZEOF_CHARP)
CHECK_TYPE_SIZE(short SIZEOF_SHORT)
CHECK_TYPE_SIZE(int SIZEOF_INT)
-CHECK_TYPE_SIZE(long SIZEOF_LONG)
CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
SET(CMAKE_EXTRA_INCLUDE_FILES stdio.h)
-CHECK_TYPE_SIZE(size_t SIZEOF_SIZE_T)
SET(CMAKE_EXTRA_INCLUDE_FILES sys/types.h)
CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T)
CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR)