RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

Reinstate r316025, reverted in r316029.

Browse Source 
Original commit message:
"[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)."

The new patch brings back the old behavior in the cases where find_package
cannot find zlib.

llvm-svn: 316150
This commit is contained in:
Vassil Vassilev 2017-10-19 08:04:22 +00:00
parent d126bac879
commit 831c59ec8a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/config-ix.cmake
View File

@ -132,7 +132,17 @@ 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)
if (ZLIB_FOUND)
set(HAVE_LIBZ 1)
else()
# Some LLVM bots do not have zlib in a standard location and rely on the
# compiler to find it.
check_library_exists(z compress2 "" HAVE_LIBZ)
if(HAVE_LIBZ)
set(ZLIB_LIBRARIES z)
endif()
endif()
else()
set(HAVE_LIBZ 0)
endif()

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