diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 12:32:27 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 12:32:27 +0300 |
commit | d2e2d32933823623fa3598c8e2b8a5a322e435bb (patch) | |
tree | 4a0094ff26be1e985281ef008433ce1493b58ae7 /cmake/maintainer.cmake | |
parent | 72e0601d11ac40a27ce071cba8626612bc625e3c (diff) | |
parent | 6c3e860cbf36831c118f6ea183acbbeb3c889bed (diff) | |
download | mariadb-git-d2e2d32933823623fa3598c8e2b8a5a322e435bb.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'cmake/maintainer.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) |