Merge branch 'catch' of github.com:m6w6/libmemcached into gh-actions

diff --combined CMake/CheckDependency.cmake
index edcaea4d4f0f62403b9b9c1e5450fce268cb578d,1003d68c28b0e4d759186ff9ee08e9de619869be..862321fb4e2dd85c71d29f46d14a6d9a612ea08f
--- 1/CMake/CheckDependency.cmake
--- 2/CMake/CheckDependency.cmake
+++ b/CMake/CheckDependency.cmake
@@@ -3,6 -3,35 +3,35 @@@ find_package(PkgConfig
  include(SafeString)
  include(CheckHeader)
  
+ function(check_dependency_basic NAME LIB HEADER)
+       set(FOUND 1)
+       message("-- Checking for library '${LIB}' with header '${HEADER}' ...")
+       find_library(LIB${LIB} NAMES ${LIB})
+       if(NOT LIB${LIB})
+               set(FOUND 0)
+       endif()
+       if(HEADER)
+               safe_string(${HEADER} HEADER_CONST)
+               check_header(${HEADER})
+               if(NOT HAVE_${HEADER_CONST})
+                       set(FOUND 0)
+               else()
+                       find_path(${HEADER_CONST}_ROOT ${HEADER})
+                       if(NOT ${HEADER_CONST}_ROOT)
+                               set(FOUND 0)
+                       endif()
+               endif()
+       endif()
+       if(FOUND)
+               message("--   Found library '${LIB${LIB}}'")
+               message("--   Found include '${${HEADER_CONST}_ROOT}'")
+       else()
+               message("--   No library '${LIB}' found")
+       endif()
+       set(${NAME} ${FOUND} PARENT_SCOPE)
+       set(${NAME}_LIBRARIES ${LIB${LIB}} PARENT_SCOPE)
+       set(${NAME}_INCLUDEDIR ${${HEADER_CONST}_ROOT} PARENT_SCOPE)
+ endfunction()
  
  function(check_dependency NAME LIB HEADER)
      if(PKG_CONFIG_FOUND)
@@@ -10,34 -39,19 +39,19 @@@
          if(NOT ${NAME}_FOUND)
              pkg_check_modules(${NAME} ${LIB}${ARGN})
          endif()
-         set(${NAME} ${${NAME}_FOUND} PARENT_SCOPE)
-               set(${NAME}_LIBRARIES ${${NAME}_LDFLAGS} PARENT_SCOPE)
-         set(${NAME}_INCLUDEDIR ${${NAME}_INCLUDEDIR} PARENT_SCOPE)
+               if(NOT ${NAME}_FOUND)
+                       check_dependency_basic(${NAME} ${LIB} ${HEADER})
 -              else()  
++              else()
+                       set(${NAME} ${${NAME}_FOUND} PARENT_SCOPE)
+                       set(${NAME}_LIBRARIES ${${NAME}_LDFLAGS} PARENT_SCOPE)
+                       set(${NAME}_INCLUDEDIR ${${NAME}_INCLUDEDIR} PARENT_SCOPE)
  
-         safe_string(${LIB} LIB_CONST)
-         set(HAVE_${NAME} ${${NAME}_FOUND} PARENT_SCOPE)
-         safe_string(${HEADER} HEADER_CONST)
-         find_path(HAVE_${HEADER_CONST} ${HEADER} PATHS ${${NAME}_INCLUDEDIR})
+                       safe_string(${LIB} LIB_CONST)
+                       set(HAVE_${NAME} ${${NAME}_FOUND} PARENT_SCOPE)
+                       safe_string(${HEADER} HEADER_CONST)
+                       find_path(HAVE_${HEADER_CONST} ${HEADER} PATHS ${${NAME}_INCLUDEDIR})
+               endif()
      else()
-         set(FOUND 1)
-         find_library(LIB${LIB} NAMES ${LIB})
-         if(NOT LIB${LIB})
-             set(FOUND 0)
-         endif()
-         if(HEADER)
-             safe_string(${HEADER} HEADER_CONST)
-             check_header(${HEADER})
-             if(NOT HAVE_${HEADER_CONST})
-                 set(FOUND 0)
-             else()
-                 find_path(${HEADER_CONST}_ROOT ${HEADER})
-                 if(NOT ${HEADER_CONST}_ROOT)
-                     set(FOUND 0)
-                 endif()
-             endif()
-         endif()
-         set(${NAME} ${FOUND} PARENT_SCOPE)
-         set(${NAME}_LIBRARIES ${LIB${LIB}} PARENT_SCOPE)
-         set(${NAME}_INCLUDEDIR ${${HEADER_CONST}_ROOT} PARENT_SCOPE)
+               check_dependency_basic(${NAME} ${LIB} ${HEADER})
      endif()
  endfunction()