diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 11:29:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 11:29:32 +0300 |
| commit | 977c385df36dcb751720dc838521b7cb5a328cb9 (patch) | |
| tree | 039c8cf3e0f41bc0a1ab81eef17a4700111fbe59 /sql/CMakeLists.txt | |
| parent | fa0cada95baeb9fad5a2d6dad687bb13c93da9b6 (diff) | |
| parent | 2aab7f2d0a6555f7ebb6dcde243639354ca5da53 (diff) | |
| download | mariadb-git-977c385df36dcb751720dc838521b7cb5a328cb9.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index c26d0450229..8143136b13b 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2014, Oracle and/or its affiliates. -# Copyright (c) 2010, 2020, MariaDB Corporation. +# Copyright (c) 2010, 2022, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -176,7 +176,14 @@ SET (SQL_SOURCE ${GEN_SOURCES} ${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 |