diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
commit | dfc63866eb91ce5274647dc1176e2f98b5954a50 (patch) | |
tree | 16a66be92ba2603896b1b010600df021911be256 /cmake | |
parent | 14b769cfc6bcf5e6b3142d12e26667bcec90b2cd (diff) | |
parent | c33caca3a45cb72ed3354561d4ff9f06dc12466c (diff) | |
download | mariadb-git-dfc63866eb91ce5274647dc1176e2f98b5954a50.tar.gz |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/abi_check.cmake | 4 |
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 ) |