maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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).

llvm-svn: 316025
This commit is contained in:
Vassil Vassilev 2017-10-17 20:32:27 +00:00
parent 7dabe9ced7
commit 96d9b7f5e1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/cmake/config-ix.cmake
View File

@ -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()

2
llvm/lib/Support/CMakeLists.txt
View File

@ -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)