diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-06-13 19:21:28 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-06-13 19:21:28 +0300 |
| commit | 82942260972de9a7416064c177c3bce3512a984a (patch) | |
| tree | 1be11e8e14aa017680e03fa3124a82a2e5c97f1d /configure.cmake | |
| parent | 94d68777bbb0ebd42674a4fae77c414050ef57d8 (diff) | |
| download | mariadb-git-82942260972de9a7416064c177c3bce3512a984a.tar.gz | |
Switched off Maintainer mode by default as it gave wrong compiler warnings (as it added -Wall after some switches was already turned off)
cmake/maintainer.cmake:
Add -DFORCE_INIT_OF_VARS to not get warnings generated by -Wall
configure.cmake:
Don't add -Wall if we already have it. This is to not enable options that are already turned off.
support-files/compiler_warnings.supp:
Removed suppression that is not needed anymore
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake index 6191ceef378..83fc34b752b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -55,10 +55,10 @@ ENDIF() # Always enable -Wall for gnu C/C++ -IF(CMAKE_COMPILER_IS_GNUCXX) +IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_FLAGS MATCHES ".*-Wall.*") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter") ENDIF() -IF(CMAKE_COMPILER_IS_GNUCC) +IF(CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_C_FLAGS MATCHES ".*-Wall.*") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") ENDIF() |