[llvm] r316029 - Revert "[cmake] Use find_package to discover zlib"

[Vassil Vassilev via llvm-commits]

Author: vvassilev
Date: Tue Oct 17 13:51:25 2017
New Revision: 316029

URL: http://llvm.org/viewvc/llvm-project?rev=316029&view=rev
Log:
Revert "[cmake] Use find_package to discover zlib"

We are investigating what went wrong.

Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/lib/Support/CMakeLists.txt

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=316029&r1=316028&r2=316029&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Tue Oct 17 13:51:25 2017
@@ -132,10 +132,7 @@ endif()
 # like strlen, leading to false positives.
 if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
   if (LLVM_ENABLE_ZLIB)
-    find_package(ZLIB REQUIRED)
-    if (ZLIB_FOUND)
-      set(HAVE_LIBZ 1)
-    endif()
+    check_library_exists(z compress2 "" HAVE_LIBZ)
   else()
     set(HAVE_LIBZ 0)
   endif()

Modified: llvm/trunk/lib/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CMakeLists.txt?rev=316029&r1=316028&r2=316029&view=diff
==============================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt (original)
+++ llvm/trunk/lib/Support/CMakeLists.txt Tue Oct 17 13:51:25 2017
@@ -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} ${ZLIB_LIBRARIES})
+    set(system_libs ${system_libs} z)
   endif()
   if( UNIX AND NOT (BEOS OR HAIKU) )
     set(system_libs ${system_libs} m)