Merge branch 'v37-bugfix'

Author: erik-m

CMakePresets.json

@@ -55,7 +55,7 @@
         },
         {
             "name": "gcg-debug-nm",
-            "inherits": "gcg-default",
+            "inherits": "gcg-debug",
             "displayName": "GCG Default Debug Config (native memory)",
             "description": "Default GCG development debug build configuration with native memory handling",
             "hidden": true,

cmake/Modules/FindASan.cmake

@@ -57,3 +57,9 @@ function (add_sanitize_address TARGET)
 
     sanitizer_add_flags(${TARGET} "AddressSanitizer" "ASan")
 endfunction ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ASan
+   REQUIRED_VARS
+   ASan_FLAG_DETECTED
+)

cmake/Modules/FindSanitizers.cmake

@@ -26,21 +26,29 @@
 # link against the sanitizers.
 option(SANITIZE_LINK_STATIC "Try to link static against sanitizers." Off)
 
-
-
-
 set(FIND_QUIETLY_FLAG "")
 if (DEFINED Sanitizers_FIND_QUIETLY)
     set(FIND_QUIETLY_FLAG "QUIET")
 endif ()
 
-find_package(ASan ${FIND_QUIETLY_FLAG})
-find_package(TSan ${FIND_QUIETLY_FLAG})
-find_package(MSan ${FIND_QUIETLY_FLAG})
-find_package(UBSan ${FIND_QUIETLY_FLAG})
-
-
+list(APPEND REQUIRED_SANITIZERS "")
 
+if(SANITIZE_ADDRESS)
+   find_package(ASan ${FIND_QUIETLY_FLAG})
+   list(APPEND REQUIRED_SANITIZERS "ASan_FOUND")
+endif()
+if(SANITIZE_THREAD)
+   find_package(TSan ${FIND_QUIETLY_FLAG})
+   list(APPEND REQUIRED_SANITIZERS "TSan_FOUND")
+endif()
+if(SANITIZE_MEMORY)
+   find_package(MSan ${FIND_QUIETLY_FLAG})
+   list(APPEND REQUIRED_SANITIZERS "MSan_FOUND")
+endif()
+if(SANITIZE_UNDEFINED)
+   find_package(UBSan ${FIND_QUIETLY_FLAG})
+   list(APPEND REQUIRED_SANITIZERS "UBSan_FOUND")
+endif()
 
 function(sanitizer_add_blacklist_file FILE)
     if(NOT IS_ABSOLUTE ${FILE})
@@ -79,9 +87,22 @@ function(add_sanitizers ...)
         endif ()
 
         # Add sanitizers for target.
-        add_sanitize_address(${TARGET})
-        add_sanitize_thread(${TARGET})
-        add_sanitize_memory(${TARGET})
-        add_sanitize_undefined(${TARGET})
+        if(SANITIZE_ADDRESS)
+           add_sanitize_address(${TARGET})
+        endif()
+        if(SANITIZE_THREAD)
+           add_sanitize_thread(${TARGET})
+        endif()
+        if(SANITIZE_MEMORY)
+           add_sanitize_memory(${TARGET})
+        endif()
+        if(SANITIZE_UNDEFINED)
+           add_sanitize_undefined(${TARGET})
+        endif()
 	endforeach ()
 endfunction(add_sanitizers)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Sanitizers
+   REQUIRED_VARS
+   ${REQUIRED_SANITIZERS})

cmake/Modules/FindTSan.cmake

@@ -63,3 +63,9 @@ function (add_sanitize_thread TARGET)
 
     sanitizer_add_flags(${TARGET} "ThreadSanitizer" "TSan")
 endfunction ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(TSan
+   REQUIRED_VARS
+   TSan_FLAG_DETECTED
+)

cmake/Modules/FindUBSan.cmake

@@ -41,6 +41,11 @@ function (add_sanitize_undefined TARGET)
     if (NOT SANITIZE_UNDEFINED)
         return()
     endif ()
-
     sanitizer_add_flags(${TARGET} "UndefinedBehaviorSanitizer" "UBSan")
 endfunction ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(UBSan
+   REQUIRED_VARS
+   UBSan_FLAG_DETECTED
+)

cmake/Modules/sanitize-helpers.cmake

@@ -117,7 +117,7 @@ function (sanitizer_check_compiler_flags FLAG_CANDIDATES NAME PREFIX)
                 if (${PREFIX}_FLAG_DETECTED)
                     # If compiler is a GNU compiler, search for static flag, if
                     # SANITIZE_LINK_STATIC is enabled.
-                    if (SANITIZE_LINK_STATIC AND ("${COMPILER}" STREQUAL "GNU"))
+                    if (SANITIZE_LINK_STATIC AND (${COMPILER} STREQUAL "GNU"))
                         string(TOLOWER ${PREFIX} PREFIX_lower)
                         sanitizer_check_compiler_flag(
                             "-static-lib${PREFIX_lower}" ${LANG}

src/CMakeLists.txt

@@ -491,8 +491,10 @@ generate_export_header(libgcg BASE_NAME gcg EXPORT_FILE_NAME ${PROJECT_BINARY_DI
 target_compile_definitions(gcg PRIVATE GCG_STATIC_DEFINE)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    find_package(Sanitizers)
-    add_sanitizers(gcg)
+    if (SANITIZE_ADDRESS OR SANITIZE_MEMORY OR SANITIZE_THREAD OR SANITIZE_UNDEFINED)
+       find_package(Sanitizers)
+       add_sanitizers(gcg)
+    endif()
 endif()
 
 target_link_libraries(gcg