diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-03 10:57:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-03 10:57:57 +0200 |
| commit | 77ec219d58fb7819ec7ce7ea5a441716c850b37b (patch) | |
| tree | 1d559c9974372fcfd996d0634074bc5fc74b178f | |
| parent | 57d15d62f15e8b17eddf0a5e6c4beee8e78c07b1 (diff) | |
| download | mariadb-git-77ec219d58fb7819ec7ce7ea5a441716c850b37b.tar.gz | |
cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced;
use -ggdb3 if supported
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 3 | ||||
| -rw-r--r-- | dbug/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/xtradb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 1 |
5 files changed, 11 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 54a93ed3791..b03cdf438a3 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. @@ -263,6 +264,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) diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 2a6fb5ae31f..1453cc55053 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -370,4 +370,5 @@ SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "") SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "") SET(HAVE_UCONTEXT_H CACHE INTERNAL "") SET(HAVE_SOCKPEERCRED CACHE INTERNAL "") -ENDIF() +SET(HAVE_GGDB3 CACHE INTERNAL "") +ENDIF(MSVC) diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index fddf234a4f1..3d0b0801132 100644 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -30,6 +30,8 @@ TARGET_LINK_LIBRARIES(factorial dbug) IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode) FIND_PROGRAM(GROFF groff) FIND_PROGRAM(NROFF nroff) + MARK_AS_ADVANCED(GROFF) + MARK_AS_ADVANCED(NROFF) SET(OUTPUT_INC output1.r output2.r output3.r output4.r output5.r) SET(SOURCE_INC factorial.r main.r example1.r example2.r example3.r) ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT_INC} diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index f128833f1e7..5cbdddfa778 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -27,6 +27,7 @@ IF(UNIX) SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) ENDIF() FIND_LIBRARY(AIO_LIBRARY aio) + MARK_AS_ADVANCED(AIO_LIBRARY) IF(AIO_LIBRARY) CHECK_LIBRARY_EXISTS(${AIO_LIBRARY} io_queue_init "" HAVE_LIBAIO) IF(HAVE_LIBAIO AND HAVE_LIBAIO_H) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0acad6bf30b..dc775020954 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -31,6 +31,7 @@ INSTALL(TARGETS mysql_client_test DESTINATION ${INSTALL_BINDIR} COMPONENT Test) CHECK_INCLUDE_FILE(event.h HAVE_EVENT_H) FIND_LIBRARY(EVENT_LIBRARY event) +MARK_AS_ADVANCED(EVENT_LIBRARY) IF(HAVE_EVENT_H AND EVENT_LIBRARY) ADD_EXECUTABLE(async_queries async_queries.c) TARGET_LINK_LIBRARIES(async_queries mysqlclient ${EVENT_LIBRARY}) |