diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:08:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:08:42 +0100 |
| commit | 2573f03a05ac3d1f99f8542feff9a0ce4a63c017 (patch) | |
| tree | d547b7eb1f2add6910dee55b2754dc9e1bbdb871 /cmake/maintainer.cmake | |
| parent | 1efdd5a572ef202f64ef43d1868b021cf8c60873 (diff) | |
| download | mariadb-git-2573f03a05ac3d1f99f8542feff9a0ce4a63c017.tar.gz | |
* remove WITH_DEBUG from CMakeLists.txt
* MYSQL_MAINTAINER_MODE and SAFEMALLOC take values ON/OFF/AUTO
(in all builds, in none, only in debug and platform dependent)
* ./configure prefers RelWithDebInfo unless the user overrides
Diffstat (limited to 'cmake/maintainer.cmake')
| -rw-r--r-- | cmake/maintainer.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index 357fbd97263..cf9b1882715 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -27,7 +27,7 @@ MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS) ENDIF() SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}" - CACHE STRING "C warning options used in maintainer builds.") + CACHE INTERNAL "C warning options used in maintainer builds.") # Do not make warnings in checks into errors. SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error") ENDMACRO() @@ -36,19 +36,19 @@ ENDMACRO() MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS) SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS} -Wno-unused-parameter -Woverloaded-virtual" - CACHE STRING "C++ warning options used in maintainer builds.") + CACHE INTERNAL "C++ warning options used in maintainer builds.") ENDMACRO() # Setup ICC (Intel C Compiler) warning options. MACRO(SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS) SET(MY_MAINTAINER_WARNINGS "-Wcheck") SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS}" - CACHE STRING "C warning options used in maintainer builds.") + CACHE INTERNAL "C warning options used in maintainer builds.") ENDMACRO() # Setup ICPC (Intel C++ Compiler) warning options. MACRO(SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS) SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS}" - CACHE STRING "C++ warning options used in maintainer builds.") + CACHE INTERNAL "C++ warning options used in maintainer builds.") ENDMACRO() |