diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:42:41 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:42:41 +0300 |
commit | 618d82064618bda06bcd080af5b664b3d173dbe3 (patch) | |
tree | 5162c549a32762263786190a81f8046abf2c1b1b /sql/CMakeLists.txt | |
parent | 2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f (diff) | |
parent | 588efca2374536aab956e6366f96082f2886c73c (diff) | |
download | mariadb-git-618d82064618bda06bcd080af5b664b3d173dbe3.tar.gz |
Merge 10.7 into 10.8
Diffstat (limited to 'sql/CMakeLists.txt')
-rw-r--r-- | sql/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 8aadc22046e..8884b8f0458 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -181,6 +181,13 @@ SET (SQL_SOURCE ${MYSYS_LIBWRAP_SOURCE} ) +IF(CMAKE_C_COMPILER_ID MATCHES "Clang" AND + NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.0.0") + ADD_COMPILE_FLAGS(${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.cc + ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.cc + COMPILE_FLAGS "-Wno-unused-but-set-variable") +ENDIF() + IF ((CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS" OR WIN32 OR |