diff options
| author | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-01-14 22:17:46 +0700 |
|---|---|---|
| committer | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-01-14 22:17:46 +0700 |
| commit | 482dec9c3e6b4c25fc9ba8390472aaec62f8fd92 (patch) | |
| tree | 180de3fe4a21149e774dd2e07b1decd60e46e248 | |
| parent | 4afab3c7256e71a73ea95dd2c364454e57fceaeb (diff) | |
| download | mariadb-git-bb-10.4-MDEV-24577.tar.gz | |
MDEV-24577: Fix warnings generated during compilation of plugin/auth_pam/testing/pam_mariadb_mtr.c on FreeBSDbb-10.4-MDEV-24577
Compiler warnings generated on building MariaDB server for BSD has the same
reason as in case building is performed on MacOS. Both platforms do use
clang as a C/C++ compiler. So, fix the compiler warnings in case the compiler
is clang doesn't matter what kind of building platform do we use for building.
This is a follow-up patch for the following bug reports:
MDEV-23564: CMAKE failing due to deprecated Apple GSS method
MDEV-23935: Fix warnings generated during compilation of
plugin/auth_pam/testing/pam_mariadb_mtr.c on MacOS
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | plugin/auth_gssapi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/auth_pam/testing/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/libmariadb b/libmariadb -Subproject e38244220646a7e95c9be22576460aa7a4eb715 +Subproject bf4e75002d7625d0121fa03a72395aada6168f9 diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt index 4d3718dd471..3205a58ebbe 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") |