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 | |
| 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')
| -rw-r--r-- | cmake/character_sets.cmake | 2 | ||||
| -rw-r--r-- | cmake/configure.pl | 5 | ||||
| -rw-r--r-- | cmake/install_layout.cmake | 2 | ||||
| -rw-r--r-- | cmake/maintainer.cmake | 8 | ||||
| -rw-r--r-- | cmake/ssl.cmake | 2 |
5 files changed, 12 insertions, 7 deletions
diff --git a/cmake/character_sets.cmake b/cmake/character_sets.cmake index 1cf63ed1462..74a39e09cac 100644 --- a/cmake/character_sets.cmake +++ b/cmake/character_sets.cmake @@ -37,7 +37,7 @@ sjis swe7 tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) SET (EXTRA_CHARSETS "all") SET(WITH_EXTRA_CHARSETS ${EXTRA_CHARSETS} CACHE - STRING "Options are: none, complex, all") + STRING "Options are: none complex all") IF(WITH_EXTRA_CHARSETS MATCHES "complex") diff --git a/cmake/configure.pl b/cmake/configure.pl index 565de571452..69f973c41fb 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -149,6 +149,11 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DWITH_SSL=yes"; next; } + if($option =~ /with-debug/) + { + $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug"; + next; + } if($option =~ /with-ssl/) { $cmakeargs = $cmakeargs." -DWITH_SSL=bundled"; diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 9f9dc7dc9a3..23c787a7c97 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -68,7 +68,7 @@ IF(NOT INSTALL_LAYOUT) ENDIF() SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}" -CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer), RPM, DEB, SVR4") +CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4") IF(UNIX) IF(INSTALL_LAYOUT MATCHES "RPM") 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() diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 9b16bf09394..001be69e62f 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA MACRO (CHANGE_SSL_SETTINGS string) - SET(WITH_SSL ${string} CACHE STRING "Options are : no, bundled, yes (prefer os library if present otherwise use bundled), system (use os library)" FORCE) + SET(WITH_SSL ${string} CACHE STRING "Options are: no bundled yes(prefer os library if present otherwise use bundled) system(use os library)" FORCE) ENDMACRO() MACRO (MYSQL_USE_BUNDLED_SSL) |