diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:56:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:56:30 +0200 |
| commit | 46234f03c82e1deb20ddcc41a802d763959cc18e (patch) | |
| tree | aeb1c8a2c48a193ec5496ddf1cea76c44e0405b4 /plugin | |
| parent | 0d7380fdac1add2be3fdb57519ccd8ac9c8e12bc (diff) | |
| parent | 961c7938bb4df7a19ccd8def1e57669f7600d3e5 (diff) | |
| download | mariadb-git-46234f03c82e1deb20ddcc41a802d763959cc18e.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_gssapi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/auth_pam/testing/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt index 87c62812c39..d96d62d7e18 100644 --- a/plugin/auth_gssapi/CMakeLists.txt +++ b/plugin/auth_gssapi/CMakeLists.txt @@ -18,7 +18,7 @@ ELSE() SET(GSSAPI_SERVER gssapi_server.cc) SET(GSSAPI_ERRMSG gssapi_errmsg.cc) - IF(APPLE) + IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") SET_SOURCE_FILES_PROPERTIES( ${GSSAPI_CLIENT} ${GSSAPI_SERVER} ${GSSAPI_ERRMSG} PROPERTY COMPILE_FLAGS "-Wno-deprecated-declarations") diff --git a/plugin/auth_pam/testing/CMakeLists.txt b/plugin/auth_pam/testing/CMakeLists.txt index c8d2e3cbb97..151823b9419 100644 --- a/plugin/auth_pam/testing/CMakeLists.txt +++ b/plugin/auth_pam/testing/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_LIBRARY(pam_mariadb_mtr MODULE pam_mariadb_mtr.c) SET_TARGET_PROPERTIES (pam_mariadb_mtr PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(pam_mariadb_mtr pam) -IF(APPLE) +IF(CMAKE_C_COMPILER_ID MATCHES "Clang") SET_SOURCE_FILES_PROPERTIES( pam_mariadb_mtr.c PROPERTY COMPILE_FLAGS "-Wno-incompatible-pointer-types-discards-qualifiers") |