diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-13 21:16:20 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-13 21:16:20 +0100 |
| commit | 16e1db990abdde9c3b76b9d68381360f55194d38 (patch) | |
| tree | 1b2b5d1adc4ee42598ca7284bc200e81dcdab165 | |
| parent | 17dd1b248a4fbc8917ef9a6da0d9befc7b0ff35b (diff) | |
| parent | 2f957b5690135cd73749c5c08c6fdcf0f94f170a (diff) | |
| download | mariadb-git-16e1db990abdde9c3b76b9d68381360f55194d38.tar.gz | |
merge
| -rw-r--r-- | cmake/abi_check.cmake | 2 | ||||
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | configure.cmake | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake index 8e8426d5245..80c57fa0a6e 100644 --- a/cmake/abi_check.cmake +++ b/cmake/abi_check.cmake @@ -20,7 +20,7 @@ # # We use gcc specific preprocessing command and sed/diff, so it will # only be run on Unix and only if gcc is used. -IF(CMAKE_COMPILER_IS_GNUCC AND UNIX) +IF(CMAKE_COMPILER_IS_GNUCC AND Linux) IF(CMAKE_C_COMPILER MATCHES "ccache$") SET(COMPILER ${CMAKE_C_COMPILER_ARG1}) STRING(REGEX REPLACE "^ " "" COMPILER ${COMPILER}) diff --git a/config.h.cmake b/config.h.cmake index 1c6317e2611..4d6b28e2de3 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -18,6 +18,7 @@ #cmakedefine DOT_FRM_VERSION @DOT_FRM_VERSION@ /* Headers we may want to use. */ #cmakedefine STDC_HEADERS 1 +#cmakedefine _GNU_SOURCE 1 #cmakedefine HAVE_ALLOCA_H 1 #cmakedefine HAVE_AIO_H 1 #cmakedefine HAVE_ARPA_INET_H 1 diff --git a/configure.cmake b/configure.cmake index 9df2a4f19a1..271e18c04fd 100644 --- a/configure.cmake +++ b/configure.cmake @@ -49,6 +49,7 @@ ENDIF() IF (CMAKE_SYSTEM_NAME MATCHES "Linux") SET(TARGET_OS_LINUX 1) SET(HAVE_NPTL 1) + SET(_GNU_SOURCE 1) ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") SET(TARGET_OS_SOLARIS 1) ENDIF() |