more cleanup

[m6w6/libmemcached] / CMake / CheckDebug.cmake

diff --git a/CMake/CheckDebug.cmake b/CMake/CheckDebug.cmake
index cc91da979171d09e23d5f375ecf7445808c00e13..b83406d8f2a0af065d1162e6b0c769f3a34ceeaf 100644 (file)
--- a/CMake/CheckDebug.cmake
+++ b/CMake/CheckDebug.cmake
@@ -1,18 +1,51 @@
-include(CMakePushCheckState)
-include(CheckCXXCompilerFlag)
 
-function(check_debug)
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        add_compile_options(-O1)
-        add_definitions(-DDEBUG=1)
+function(set_flag FLAG DEFAULT)
+    unset(FLAG_CONSTANT)
+    string(MAKE_C_IDENTIFIER CXX${FLAG} FLAG_CONSTANT)
+    check_cxx_compiler_flag(${FLAG} ${FLAG_CONSTANT})
+    if(${FLAG_CONSTANT})
+        add_compile_options(${FLAG})
+    elseif(DEFAULT)
+        add_compile_options(${DEFAULT})
+    endif()
+endfunction()
+
+macro(check_sanitizer VAR NAME LIB)
+    message(STATUS "Checking for sanitizer: ${NAME} (-l${LIB})")
+    if(${NAME} IN_LIST ${VAR} OR ${LIB} IN_LIST ${VAR})
+        make_have_identifier(${LIB} HAVE)
+        cmake_push_check_state(RESET)
+        set(CMAKE_REQUIRED_LIBRARIES ${LIB})
+        check_cxx_compiler_flag(-fsanitize=${NAME} ${HAVE})
+        cmake_pop_check_state()
+        if(${HAVE})
+            add_compile_definitions(${HAVE})
+            add_compile_options(-fsanitize=${NAME})
+            link_libraries(-fsanitize=${NAME})
+            set_flag(-fsanitize-recover=${NAME} IGNORE)
+            message(STATUS "  OK: sanitizer ${NAME}")
+        else()
+            message(STATUS "  NO: not supported")
+        endif()
+    else()
+        message(STATUS "  NO: not requested")
+    endif()
+endmacro()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_definitions(-DDEBUG=1)
+    if(CMAKE_CXX_FLAGS MATCHES --coverage)
+        message("-- Coverage build detected!")
+        message("--   Skipping debug and sanitizer flag checks.")
+    else()
+        set_flag(-Og -O0)
+        set_flag(-ggdb -g)
         foreach(FLAG IN ITEMS
                 -fno-inline
                 -fno-omit-frame-pointer
                 -fno-eliminate-unused-debug-types
                 -funsafe-loop-optimizations
 
-                -g3
-
                 -Wall
                 -Wextra
 
@@ -27,38 +60,16 @@ function(check_debug)
                 -Wunknown-pragmas
                 -Wunsafe-loop-optimizations
                 )
-            unset(FLAG_CONSTANT)
-            string(MAKE_C_IDENTIFIER CXX${FLAG} FLAG_CONSTANT)
-            check_cxx_compiler_flag(${FLAG} ${FLAG_CONSTANT})
-            if(${FLAG_CONSTANT})
-                add_compile_options(${FLAG})
-            endif()
+            set_flag(${FLAG} IGNORE)
         endforeach()
 
         if(ENABLE_SANITIZERS)
-            if(address IN_LIST ENABLE_SANITIZERS OR asan IN_LIST ENABLE_SANITIZERS)
-                cmake_push_check_state(RESET)
-                set(CMAKE_REQUIRED_LIBRARIES asan)
-                check_cxx_compiler_flag(-fsanitize=address HAVE_ASAN)
-                cmake_pop_check_state()
-                if(HAVE_ASAN)
-                    add_compile_options(-fsanitize=address)
-                    add_link_options(-lasan)
-                endif()
-            endif()
-
-            if(undefined IN_LIST ENABLE_SANITIZERS OR ubsan IN_LIST ENABLE_SANITIZERS)
-                cmake_push_check_state(RESET)
-                set(CMAKE_REQUIRED_LIBRARIES ubsan)
-                check_cxx_compiler_flag(-fsanitize=undefined HAVE_UBSAN)
-                cmake_pop_check_state()
-                if(HAVE_UBSAN)
-                    add_compile_options(-fsanitize=undefined)
-                    add_link_options(-lubsan)
-                endif()
-            endif()
+            check_sanitizer(ENABLE_SANITIZERS address asan)
+            check_sanitizer(ENABLE_SANITIZERS undefined ubsan)
+            check_sanitizer(ENABLE_SANITIZERS thread tsan)
+            check_sanitizer(ENABLE_SANITIZERS leak lsan)
         endif()
-    else()
-        add_definitions(-DDEBUG=0)
     endif()
-endfunction()
+else()
+    add_definitions(-DDEBUG=0)
+endif()