This is an archive of the discontinued LLVM Phabricator instance.

Differential D84691

[CMake] Move find_package(ZLIB) to LLVMConfig
ClosedPublic

Authored by phosek on Jul 27 2020, 11:58 AM.

Details

Reviewers
smeenai
compnerd
mehdi_amini
Commits
rG64d99cc6abed: [CMake] Move find_package(ZLIB) to LLVMConfig
Summary

This way, downstream projects don't have to invoke find_package(ZLIB)
reducing the amount of boilerplate.

Diff Detail

Unit TestsFailed

TimeTest
170 mslinux > Polly.ScopInfo::Unknown Unit Message ("")

Event Timeline

phosek created this revision.Jul 27 2020, 11:58 AM
Herald added projects: Restricted Project, Restricted Project, Restricted Project, Restricted Project. · View Herald TranscriptJul 27 2020, 11:58 AM
Herald added subscribers: llvm-commits, lldb-commits, cfe-commits and 17 others. · View Herald Transcript
phosek mentioned this in D79219: [CMake] Simplify CMake handling for zlib.Jul 27 2020, 11:59 AM
Harbormaster failed remote builds in B65895: Diff 281007!Jul 27 2020, 1:54 PM
compnerd accepted this revision.Jul 27 2020, 3:04 PM

Thanks, this is a great idea!

This revision is now accepted and ready to land.Jul 27 2020, 3:04 PM
mehdi_amini added a comment.Jul 27 2020, 5:11 PM

Thanks!

Closed by commit rG64d99cc6abed: [CMake] Move find_package(ZLIB) to LLVMConfig (authored by phosek). · Explain WhyJul 27 2020, 5:14 PM
This revision was automatically updated to reflect the committed changes.
stephenneuendorffer added a comment.Jul 27 2020, 5:17 PM

Perfect! Thanks!

Revision Contents

PathSize
clang/
4 lines
lld/
4 lines
lldb/
cmake/
modules/
4 lines
llvm/
cmake/
modules/
3 lines
mlir/
examples/
standalone/
4 lines

Diff 281007

clang/CMakeLists.txt

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linesif( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
option(LLVM_INSTALL_TOOLCHAIN_ONLY option(LLVM_INSTALL_TOOLCHAIN_ONLY
"Only include toolchain files in the 'install' target." OFF) "Only include toolchain files in the 'install' target." OFF)
option(LLVM_FORCE_USE_OLD_HOST_TOOLCHAIN option(LLVM_FORCE_USE_OLD_HOST_TOOLCHAIN
"Set to ON to force using an old, unsupported host toolchain." OFF) "Set to ON to force using an old, unsupported host toolchain." OFF)
option(CLANG_ENABLE_BOOTSTRAP "Generate the clang bootstrap target" OFF) option(CLANG_ENABLE_BOOTSTRAP "Generate the clang bootstrap target" OFF)
option(LLVM_ENABLE_LIBXML2 "Use libxml2 if available." ON) option(LLVM_ENABLE_LIBXML2 "Use libxml2 if available." ON)
if(LLVM_ENABLE_ZLIB)
find_package(ZLIB)
endif()
include(AddLLVM) include(AddLLVM)
include(TableGen) include(TableGen)
include(HandleLLVMOptions) include(HandleLLVMOptions)
include(VersionFromVCS) include(VersionFromVCS)
include(LLVMDistributionSupport) include(LLVMDistributionSupport)
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
▲ Show 20 Lines • Show All 781 Lines • Show Last 20 Lines

lld/CMakeLists.txt

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Linesif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS}) include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS})
link_directories(${LLVM_LIBRARY_DIRS}) link_directories(${LLVM_LIBRARY_DIRS})
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
if(LLVM_ENABLE_ZLIB)
find_package(ZLIB)
endif()
include(AddLLVM) include(AddLLVM)
include(TableGen) include(TableGen)
include(HandleLLVMOptions) include(HandleLLVMOptions)
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)
if(CMAKE_VERSION VERSION_LESS 3.12) if(CMAKE_VERSION VERSION_LESS 3.12)
include(FindPythonInterp) include(FindPythonInterp)
if(NOT PYTHONINTERP_FOUND) if(NOT PYTHONINTERP_FOUND)
▲ Show 20 Lines • Show All 169 Lines • Show Last 20 Lines

lldb/cmake/modules/LLDBStandalone.cmake

Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines
else() else()
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
endif() endif()
# We append the directory in which LLVMConfig.cmake lives. We expect LLVM's # We append the directory in which LLVMConfig.cmake lives. We expect LLVM's
# CMake modules to be in that directory as well. # CMake modules to be in that directory as well.
list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}") list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
if(LLVM_ENABLE_ZLIB)
find_package(ZLIB)
endif()
include(AddLLVM) include(AddLLVM)
include(TableGen) include(TableGen)
include(HandleLLVMOptions) include(HandleLLVMOptions)
include(CheckAtomic) include(CheckAtomic)
include(LLVMDistributionSupport) include(LLVMDistributionSupport)
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "")
Show All 20 Lines

llvm/cmake/modules/LLVMConfig.cmake.in

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Lines
set(LLVM_ENABLE_TERMINFO @LLVM_ENABLE_TERMINFO@) set(LLVM_ENABLE_TERMINFO @LLVM_ENABLE_TERMINFO@)
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)
find_package(ZLIB)
endif()
set(LLVM_LIBXML2_ENABLED @LLVM_LIBXML2_ENABLED@) set(LLVM_LIBXML2_ENABLED @LLVM_LIBXML2_ENABLED@)
set(LLVM_WITH_Z3 @LLVM_WITH_Z3@) set(LLVM_WITH_Z3 @LLVM_WITH_Z3@)
set(LLVM_ENABLE_DIA_SDK @LLVM_ENABLE_DIA_SDK@) set(LLVM_ENABLE_DIA_SDK @LLVM_ENABLE_DIA_SDK@)
set(LLVM_NATIVE_ARCH @LLVM_NATIVE_ARCH@) set(LLVM_NATIVE_ARCH @LLVM_NATIVE_ARCH@)
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines

mlir/examples/standalone/CMakeLists.txt

Show All 23 Lines
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/bin) set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/bin)
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/lib) set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/lib)
set(MLIR_BINARY_DIR ${CMAKE_BINARY_DIR}) set(MLIR_BINARY_DIR ${CMAKE_BINARY_DIR})
list(APPEND CMAKE_MODULE_PATH "${MLIR_CMAKE_DIR}") list(APPEND CMAKE_MODULE_PATH "${MLIR_CMAKE_DIR}")
list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}") list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
if(LLVM_ENABLE_ZLIB)
find_package(ZLIB)
endif()
include(TableGen) include(TableGen)
include(AddLLVM) include(AddLLVM)
include(AddMLIR) include(AddMLIR)
include(HandleLLVMOptions) include(HandleLLVMOptions)
include_directories(${LLVM_INCLUDE_DIRS}) include_directories(${LLVM_INCLUDE_DIRS})
include_directories(${MLIR_INCLUDE_DIRS}) include_directories(${MLIR_INCLUDE_DIRS})
include_directories(${PROJECT_SOURCE_DIR}/include) include_directories(${PROJECT_SOURCE_DIR}/include)
Show All 9 Lines