X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMake%2FCheckDebug.cmake;h=fb188529afed4551c3daa189a65159e1b81405e4;hb=8ea10d6b17c1eb260a2710bf1a6e29d759245e29;hp=e3e046bf8c7be78accb56c79c458c294f4d84bbf;hpb=c0e01749a40fc9006c9aed41ccfbffc1ae085c82;p=awesomized%2Flibmemcached

diff --git a/CMake/CheckDebug.cmake b/CMake/CheckDebug.cmake
index e3e046bf..fb188529 100644
--- a/CMake/CheckDebug.cmake
+++ b/CMake/CheckDebug.cmake
@@ -1,7 +1,5 @@
-include(CMakePushCheckState)
-include(CheckCXXCompilerFlag)
 
-function(check_flag FLAG DEFAULT)
+function(set_flag FLAG DEFAULT)
     unset(FLAG_CONSTANT)
     string(MAKE_C_IDENTIFIER CXX${FLAG} FLAG_CONSTANT)
     check_cxx_compiler_flag(${FLAG} ${FLAG_CONSTANT})
@@ -12,67 +10,66 @@ function(check_flag FLAG DEFAULT)
     endif()
 endfunction()
 
-function(check_debug)
-    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.")
+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()
-            check_flag(-Og -O0)
-            check_flag(-ggdb -g)
-            foreach(FLAG IN ITEMS
-                    -fno-inline
-                    -fno-omit-frame-pointer
-                    -fno-eliminate-unused-debug-types
-                    -funsafe-loop-optimizations
+            message(STATUS "  NO: not supported")
+        endif()
+    else()
+        message(STATUS "  NO: not requested")
+    endif()
+endmacro()
 
-                    -Wall
-                    -Wextra
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT MSVC)
+    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
 
-                    -Wdouble-promotion
-                    -Wduplicated-cond
-                    -Wduplicated-branches
-                    -Wformat=2
-                    -Wlogical-op
-                    -Wnull-dereference
-                    -Wrestrict
-                    -Wshadow
-                    -Wunknown-pragmas
-                    -Wunsafe-loop-optimizations
-                    )
-                check_flag(${FLAG} IGNORE)
-            endforeach()
+                -Wall
+                -Wextra
 
-            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_definitions(HAVE_ASAN)
-                        add_compile_options(-fsanitize=address)
-                        link_libraries(-fsanitize=address)
-                        check_flag(-fsanitize-recover=address IGNORE)
-                    endif()
-                endif()
+                -Wdouble-promotion
+                -Wduplicated-cond
+                -Wduplicated-branches
+                -Wformat=2
+                -Wlogical-op
+                -Wnull-dereference
+                -Wrestrict
+                -Wshadow
+                -Wunknown-pragmas
+                -Wunsafe-loop-optimizations
+                )
+            set_flag(${FLAG} IGNORE)
+        endforeach()
 
-                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_definitions(HAVE_UBSAN)
-                        add_compile_options(-fsanitize=undefined)
-                        link_libraries(-fsanitize=undefined)
-                        check_flag(-fsanitize-recover=undefined IGNORE)
-                    endif()
-                endif()
-            endif()
+        if(ENABLE_SANITIZERS)
+            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()