[all-commits] [llvm/llvm-project] 1d09ec: [CMake] Simplify CMake handling for zlib

Petr Hosek via All-commits all-commits at lists.llvm.org
Thu Jul 23 14:47:58 PDT 2020


  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 1d09ecf36175f7910ffedd6d497c07b5c74c22fb
      https://github.com/llvm/llvm-project/commit/1d09ecf36175f7910ffedd6d497c07b5c74c22fb
  Author: Petr Hosek <phosek at google.com>
  Date:   2020-07-23 (Thu, 23 Jul 2020)

  Changed paths:
    M clang/CMakeLists.txt
    M clang/test/CMakeLists.txt
    M clang/test/lit.site.cfg.py.in
    M compiler-rt/test/lit.common.configured.in
    M lld/CMakeLists.txt
    M lld/test/CMakeLists.txt
    M lld/test/lit.site.cfg.py.in
    M lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
    M lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
    M llvm/cmake/config-ix.cmake
    M llvm/include/llvm/Config/config.h.cmake
    M llvm/lib/Support/CMakeLists.txt
    M llvm/lib/Support/CRC.cpp
    M llvm/lib/Support/Compression.cpp
    M llvm/test/CMakeLists.txt
    M llvm/test/lit.site.cfg.py.in
    M llvm/unittests/Support/CompressionTest.cpp

  Log Message:
  -----------
  [CMake] Simplify CMake handling for zlib

Rather than handling zlib handling manually, use find_package from CMake
to find zlib properly. Use this to normalize the LLVM_ENABLE_ZLIB,
HAVE_ZLIB, HAVE_ZLIB_H. Furthermore, require zlib if LLVM_ENABLE_ZLIB is
set to YES, which requires the distributor to explicitly select whether
zlib is enabled or not. This simplifies the CMake handling and usage in
the rest of the tooling.

This is a reland of abb0075 with all followup changes and fixes that
should address issues that were reported in PR44780.

Differential Revision: https://reviews.llvm.org/D79219




More information about the All-commits mailing list