diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 11:35:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 11:35:39 +0300 |
| commit | 6c3e860cbf36831c118f6ea183acbbeb3c889bed (patch) | |
| tree | 8585545cc8a95e790c01eb164f74685674f9f23b /cmake | |
| parent | 9ff737b25edbcb0c74d9d312f6da702e7d993e88 (diff) | |
| parent | 5008171b05e0d3b8b5f4af312b94a312281e77c7 (diff) | |
| download | mariadb-git-6c3e860cbf36831c118f6ea183acbbeb3c889bed.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/maintainer.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index f50fea22563..0df943be863 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -1,5 +1,5 @@ # Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2020, MariaDB +# Copyright (c) 2011, 2021, MariaDB # # 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 @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA -IF(MSVC) +IF(MYSQL_MAINTAINER_MODE STREQUAL "NO") RETURN() ENDIF() @@ -50,7 +50,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0") SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=maybe-uninitialized) ENDIF() -IF(MYSQL_MAINTAINER_MODE MATCHES "OFF") +IF(MYSQL_MAINTAINER_MODE MATCHES "OFF|WARN") RETURN() ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO") SET(WHERE DEBUG) |