summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-07-29 16:32:11 +0400
committerAlexander Nozdrin <alik@sun.com>2010-07-29 16:32:11 +0400
commit32f3ab7933240277e52f05e39e4d45f19f7ac3d7 (patch)
tree16a66be92ba2603896b1b010600df021911be256 /cmake
parentd85c6281802c8f6ef7187518f9f4357d96134b3e (diff)
parent6bd182e9f22e02f29e7f14e6dd8bf14eaeee084e (diff)
downloadmariadb-git-32f3ab7933240277e52f05e39e4d45f19f7ac3d7.tar.gz
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/abi_check.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake
index 0d5bf21f540..7911b7848a8 100644
--- a/cmake/abi_check.cmake
+++ b/cmake/abi_check.cmake
@@ -38,7 +38,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
-DCOMPILER=${COMPILER}
-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-DBINARY_DIR=${CMAKE_BINARY_DIR}
- "-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
+ "-DDMYSQL_ABI_CHECK -DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
-P ${CMAKE_SOURCE_DIR}/cmake/do_abi_check.cmake
VERBATIM
)
@@ -48,7 +48,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
-DCMAKE_C_COMPILER=${COMPILER}
-DCMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}
- "-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
+ "-DMYSQL_ABI_CHECK -DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
-P ${CMAKE_SOURCE_DIR}/cmake/scripts/do_abi_check.cmake
VERBATIM
)