diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-19 13:12:38 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-19 13:12:38 -0400 |
commit | a76a6601ecb63d452c89202d8ca7f11bf2e0194f (patch) | |
tree | 80cefcea92a47dff8c41220411ea237022a82d4c /CMakeLists.txt | |
parent | 0f5522c44f9ebb002f203ad1f983b77e3925581c (diff) | |
parent | 0c64cd83eb392a0d2085eb6340623273a3402d4d (diff) | |
download | mariadb-git-a76a6601ecb63d452c89202d8ca7f11bf2e0194f.tar.gz |
bzr merge -rtag:mariadb-10.0.12 maria/10.0
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 393aff64faa..3aafc852f16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ IF(UNIX AND NOT APPLE) # Compiling with PIC speeds up embedded build, on PIC sensitive systems # Predefine it to OFF in release builds, because of the performance penalty SET(WITH_PIC ${WITH_PIC_DEFAULT} CACHE BOOL "Compile with PIC.") + MARK_AS_ADVANCED(WITH_PIC) ENDIF() # Optionally set project name, e.g. @@ -266,6 +267,10 @@ IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE) SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov") ENDIF() +MY_CHECK_C_COMPILER_FLAG(-ggdb3 HAVE_GGDB3) +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3") +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3") + OPTION(ENABLED_LOCAL_INFILE "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN}) MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE) @@ -487,7 +492,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -INSTALL_DOCUMENTATION(README TODO CREDITS COPYING COPYING.LESSER +INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT COMPONENT Readme) INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) |