diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-26 08:40:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-26 08:40:36 +0300 |
| commit | ed4b2b3f95f899766a05dbd46988d58bfb58ccae (patch) | |
| tree | fef4b99365fa6173e43bcca6efcf870c690a99f9 /cmake | |
| parent | b81382887cdd639df33b4fa359beb615a37d2293 (diff) | |
| parent | 4725792bf3ca17b581586f54a2e0058b4a18cff1 (diff) | |
| download | mariadb-git-ed4b2b3f95f899766a05dbd46988d58bfb58ccae.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/maintainer.cmake | 9 | ||||
| -rw-r--r-- | cmake/os/AIX.cmake | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index 0df943be863..b2b2eef9245 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -14,7 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA -IF(MYSQL_MAINTAINER_MODE STREQUAL "NO") +IF(MSVC OR MYSQL_MAINTAINER_MODE STREQUAL "NO") + # Windows support is in cmake/os/Windows.cmake, not here RETURN() ENDIF() @@ -40,11 +41,7 @@ FOREACH(F ${MY_WARNING_FLAGS}) MY_CHECK_AND_SET_COMPILER_FLAG(${F} DEBUG RELWITHDEBINFO) ENDFOREACH() -IF(CMAKE_SYSTEM_NAME MATCHES AIX) - SET(MY_ERROR_FLAGS "") -ELSE() - SET(MY_ERROR_FLAGS -Werror) -ENDIF() +SET(MY_ERROR_FLAGS -Werror) 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) diff --git a/cmake/os/AIX.cmake b/cmake/os/AIX.cmake index bd4c2a1df97..299b79198c6 100644 --- a/cmake/os/AIX.cmake +++ b/cmake/os/AIX.cmake @@ -33,3 +33,6 @@ ELSE() SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -maix64 -pthread -mcmodel=large") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -maix64 -pthread -mcmodel=large") ENDIF() + +# make it WARN by default, not AUTO (that implies -Werror) +SET(MYSQL_MAINTAINER_MODE "WARN" CACHE STRING "Enable MariaDB maintainer-specific warnings. One of: NO (warnings are disabled) WARN (warnings are enabled) ERR (warnings are errors) AUTO (warnings are errors in Debug only)") |