diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:40:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:41:41 +0100 |
| commit | 4e1d3f83b79cd5f3a920937b462e585fdfb5a35d (patch) | |
| tree | 07e099b50109bd09ff8a5267c5cb5e0bf89597b4 /cmake/maintainer.cmake | |
| parent | a82cfe109cbc033253ddaba82f9c2de663601002 (diff) | |
| parent | cc71e7501cb623b2d600c47dbe10a31dcf6e8fcf (diff) | |
| download | mariadb-git-4e1d3f83b79cd5f3a920937b462e585fdfb5a35d.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'cmake/maintainer.cmake')
| -rw-r--r-- | cmake/maintainer.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index 4a13edceece..30ba667d7f9 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -33,10 +33,15 @@ SET(MY_WARNING_FLAGS -Wnon-virtual-dtor -Wvla -Wwrite-strings + -Werror ) -IF(MYSQL_MAINTAINER_MODE MATCHES "ON") - SET(WHERE) +IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0") + SET(MY_WARNING_FLAGS ${MY_WARNING_FLAGS} -Wno-error=maybe-uninitialized) +ENDIF() + +IF(MYSQL_MAINTAINER_MODE MATCHES "OFF") + RETURN() ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO") SET(WHERE DEBUG) ENDIF() |