This is an archive of the discontinued LLVM Phabricator instance.

Differential D116235

[CMake] Include ZLIB_ROOT in LLVMConfig.cmake
ClosedPublic

Authored by Jake-Egan on Dec 23 2021, 12:44 PM.

Details

Reviewers
daltenty
phosek
Commits
rGe3a261831bd9: [CMake] Include ZLIB_ROOT in LLVMConfig.cmake
Summary

Include the value of ZLIB_ROOT in LLVMConfig.cmake so FindZLIB can pick it up. This fixes an issue where ZLIB is not found on AIX runtimes despite specifying -DZLIB_ROOT.

Diff Detail

Event Timeline

Jake-Egan created this revision.Dec 23 2021, 12:44 PM
Herald added a subscriber: mgorny. · View Herald TranscriptDec 23 2021, 12:44 PM
Jake-Egan requested review of this revision.Dec 23 2021, 12:44 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 23 2021, 12:44 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Jake-Egan edited the summary of this revision. (Show Details)Dec 23 2021, 12:47 PM
Jake-Egan added a reviewer: daltenty.
Harbormaster completed remote builds in B140544: Diff 396078.Dec 23 2021, 1:25 PM
Jake-Egan added a reviewer: phosek.Dec 29 2021, 11:07 AM
daltenty accepted this revision.Jan 5 2022, 8:25 AM

LGTM, if the user is setting the ZLIB_ROOT at configure time we should pass it on to the other build stages (e.g compiler-rt)

This revision is now accepted and ready to land.Jan 5 2022, 8:25 AM
This revision was landed with ongoing or failed builds.Jan 6 2022, 8:25 AM
Closed by commit rGe3a261831bd9: [CMake] Include ZLIB_ROOT in LLVMConfig.cmake (authored by Jake-Egan). · Explain Why
This revision was automatically updated to reflect the committed changes.
Jake-Egan added a commit: rGe3a261831bd9: [CMake] Include ZLIB_ROOT in LLVMConfig.cmake.

Revision Contents

PathSize
llvm/
cmake/
modules/
1 line

Diff 397905

llvm/cmake/modules/LLVMConfig.cmake.in

Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Lines
endif() endif()
set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@) set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@) set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@)
set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@) set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@)
if(LLVM_ENABLE_ZLIB) if(LLVM_ENABLE_ZLIB)
set(ZLIB_ROOT @ZLIB_ROOT@)
find_package(ZLIB) find_package(ZLIB)
endif() endif()
set(LLVM_ENABLE_LIBXML2 @LLVM_ENABLE_LIBXML2@) set(LLVM_ENABLE_LIBXML2 @LLVM_ENABLE_LIBXML2@)
if(LLVM_ENABLE_LIBXML2) if(LLVM_ENABLE_LIBXML2)
find_package(LibXml2) find_package(LibXml2)
endif() endif()
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines