From 4be3ae9738c16f54e546e99c8f3c6459fae1b21c Mon Sep 17 00:00:00 2001
From: Joakim Karlsson <oakimk@gmail.com>
Date: Mon, 25 Jul 2022 13:54:38 +0200
Subject: [PATCH] CMake: improve finding C-Ares library

---
 cmake/modules/FindCARES.cmake | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/FindCARES.cmake b/cmake/modules/FindCARES.cmake
index e3794a9bb6..f69a2a906b 100644
--- a/cmake/modules/FindCARES.cmake
+++ b/cmake/modules/FindCARES.cmake
@@ -17,10 +17,23 @@ ENDIF (CARES_INCLUDE_DIRS)
 INCLUDE(FindWSWinLibs)
 FindWSWinLibs("c-ares-.*" "CARES_HINTS")
 
-FIND_PATH(CARES_INCLUDE_DIR ares.h HINTS "${CARES_HINTS}/include" )
+find_path( CARES_INCLUDE_DIR
+  NAMES ares.h
+  PATH_SUFFIXES
+        include
+  HINTS
+    "${CARES_INCLUDEDIR}"
+    "${CARES_HINTS}"
+)
 
-SET(CARES_NAMES cares libcares-2)
-FIND_LIBRARY(CARES_LIBRARY NAMES ${CARES_NAMES} HINTS "${CARES_HINTS}/lib" )
+find_library( CARES_LIBRARY
+  NAMES cares libcares-2
+  PATH_SUFFIXES
+        lib64 lib
+  HINTS
+    "${CARES_LIBDIR}"
+    "${CARES_HINTS}"
+)
 
 # Try to retrieve version from header if found
 if(CARES_INCLUDE_DIR)