summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-10-13 12:11:29 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-10-13 12:11:29 -0300
commit215e967ace1c5cbcdcaf82d1b00b31bc9f132393 (patch)
tree0474850f6234405da1be770410019f50b4a96f32 /cmake
parente760a4d8ab820e5072149b2c1e86bb0a42f85171 (diff)
downloadmariadb-git-215e967ace1c5cbcdcaf82d1b00b31bc9f132393.tar.gz
Use a guard macro to prevent the inclusion of system headers
when checking the ABI with the C Preprocessor. Also, add the new hearders to the cmake based ABI check. cmake/abi_check.cmake: Add headers which were added to the autotools ABI check. Remove trailing spaces. include/mysql/client_plugin.h: Guard the inclusion of system headers.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/abi_check.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake
index b9ff9f7af73..2488bcefe33 100644
--- a/cmake/abi_check.cmake
+++ b/cmake/abi_check.cmake
@@ -27,12 +27,14 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
ELSE()
SET(COMPILER ${CMAKE_C_COMPILER})
ENDIF()
- SET(API_PREPROCESSOR_HEADER
+ SET(API_PREPROCESSOR_HEADER
${CMAKE_SOURCE_DIR}/include/mysql/plugin_audit.h
${CMAKE_SOURCE_DIR}/include/mysql/plugin_ftparser.h
${CMAKE_SOURCE_DIR}/include/mysql.h
- ${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v1.h
+ ${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v1.h
${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v2.h
+ ${CMAKE_SOURCE_DIR}/include/mysql/client_plugin.h
+ ${CMAKE_SOURCE_DIR}/include/mysql/plugin_auth.h
)
ADD_CUSTOM_TARGET(abi_check ALL