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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b0c4898785..b5505b5ba6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,7 @@ ENDIF() # INCLUDE(maintainer) -SET(MYSQL_MAINTAINER_MODE "AUTO" CACHE STRING "MySQL maintainer-specific development environment. Options are: ON OFF AUTO.") +SET(MYSQL_MAINTAINER_MODE "OFF" CACHE STRING "MySQL maintainer-specific development environment. Options are: ON OFF AUTO.") MARK_AS_ADVANCED(MYSQL_MAINTAINER_MODE) # Whether the maintainer mode compiler options should be enabled. @@ -261,16 +261,18 @@ MYSQL_CHECK_SSL() MYSQL_CHECK_READLINE() # -# Setup maintainer mode options by the end. Platform checks are +# Setup maintainer mode options. Platform checks are # not run with the warning options as to not perturb fragile checks # (i.e. do not make warnings into errors). +# We have to add MAINTAINER_C_WARNINGS first to ensure that the flags +# given by the invoking user are honored # IF(MYSQL_MAINTAINER_MODE MATCHES "ON") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}") + SET(CMAKE_C_FLAGS "${MY_MAINTAINER_C_WARNINGS} ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "${MY_MAINTAINER_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MY_MAINTAINER_C_WARNINGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MY_MAINTAINER_CXX_WARNINGS}") + SET(CMAKE_C_FLAGS_DEBUG "${MY_MAINTAINER_C_WARNINGS} ${CMAKE_C_FLAGS_DEBUG}") + SET(CMAKE_CXX_FLAGS_DEBUG "${MY_MAINTAINER_CXX_WARNINGS} ${CMAKE_CXX_FLAGS_DEBUG}") ENDIF() IF(WITH_UNIT_TESTS) |