diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-11 15:18:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-11 15:18:49 +0300 |
| commit | 7434eb566e2cb832d7798196d50629dcaa1d7f79 (patch) | |
| tree | 1c3c4a81c763d385e1bfea2ab5cfe6ea619c86b3 /sql | |
| parent | 3f5b03c415662135257a4ae9bc525fd72a795872 (diff) | |
| parent | e8101a4d033a59237d542f4bd0ae0b5323058e26 (diff) | |
| download | mariadb-git-7434eb566e2cb832d7798196d50629dcaa1d7f79.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql')
| -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 e42f1a164df..e7c87698451 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, 2018, 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 @@ -152,7 +152,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}/sql_yacc.cc + ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc + COMPILE_FLAGS "-Wno-unused-but-set-variable") +ENDIF() + IF ((CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS" OR WIN32 OR |