[all-commits] [llvm/llvm-project] 3ab015: Revert "[CMake] Simplify CMake handling for zlib"

Hans via All-commits all-commits at lists.llvm.org
Wed Aug 5 03:32:10 PDT 2020


  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 3ab01550b632dad46f9595d74855749557ffd25c
      https://github.com/llvm/llvm-project/commit/3ab01550b632dad46f9595d74855749557ffd25c
  Author: Hans Wennborg <hans at chromium.org>
  Date:   2020-08-05 (Wed, 05 Aug 2020)

  Changed paths:
    M clang/test/CMakeLists.txt
    M clang/test/lit.site.cfg.py.in
    M compiler-rt/test/lit.common.configured.in
    M lld/test/CMakeLists.txt
    M lld/test/lit.site.cfg.py.in
    M lldb/cmake/modules/LLDBStandalone.cmake
    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/cmake/modules/LLVMConfig.cmake.in
    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
    M mlir/examples/standalone/CMakeLists.txt

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

This quietly disabled use of zlib on Windows even when building with
-DLLVM_ENABLE_ZLIB=FORCE_ON.

> 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

This reverts commit 10b1b4a231a485f1711d576e6131f6755e008abe and follow-ups
64d99cc6abed78c00a2a7863b02ce54911a5264f and
f9fec0447e12da9e8cf4b628f6d45f4941e7d182.




More information about the All-commits mailing list