[cmake] Use find_package to discover zlib

This allows us to use standard cmake utilities to point to non-system zlib
locations.

Patch by Oksana Shadura and me (D39002).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316025 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 7f33591de0c89fdff0fbaeb10f831e8caaee55ce..c90f2d836c8fd3587dc42b2800580aa6cb805fdf 100644 (file)
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -132,7 +132,10 @@ endif()
 # like strlen, leading to false positives.
 if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
   if (LLVM_ENABLE_ZLIB)
-    check_library_exists(z compress2 "" HAVE_LIBZ)
+    find_package(ZLIB REQUIRED)
+    if (ZLIB_FOUND)
+      set(HAVE_LIBZ 1)
+    endif()
   else()
     set(HAVE_LIBZ 0)
   endif()

diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
index 56aaf10ec2cd4dbb0605831920852af88e739f4b..5dcb5e58af4ce93224951d1160138d832d77bf0e 100644 (file)
--- a/lib/Support/CMakeLists.txt
+++ b/lib/Support/CMakeLists.txt
@@ -22,7 +22,7 @@ elseif( CMAKE_HOST_UNIX )
   endif()
   set(system_libs ${system_libs} ${LLVM_PTHREAD_LIB})
   if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ )
-    set(system_libs ${system_libs} z)
+    set(system_libs ${system_libs} ${ZLIB_LIBRARIES})
   endif()
   if( UNIX AND NOT (BEOS OR HAIKU) )
     set(system_libs ${system_libs} m)