Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From 38146a5d803a1fb9b10f011aa857872b6f20cd02 Mon Sep 17 00:00:00 2001 |
| 2 | From: Tongliang Liao <xkszltl@gmail.com> |
| 3 | Date: Mon, 29 Apr 2019 03:51:51 -0700 |
| 4 | Subject: [PATCH] CMake has stock FindZLIB in upper case. More details in |
| 5 | https://cmake.org/cmake/help/v3.14/module/FindZLIB.html |
| 6 | |
| 7 | |
| 8 | Upstream-Status: Backport https://github.com/facebook/rocksdb/pull/5261 |
| 9 | |
| 10 | --- |
| 11 | CMakeLists.txt | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 15 | index 40cdd26bb..355686566 100644 |
| 16 | --- a/CMakeLists.txt |
| 17 | +++ b/CMakeLists.txt |
| 18 | @@ -92,7 +92,7 @@ else() |
| 19 | endif() |
| 20 | |
| 21 | if(WITH_ZLIB) |
| 22 | - find_package(zlib REQUIRED) |
| 23 | + find_package(ZLIB REQUIRED) |
| 24 | add_definitions(-DZLIB) |
| 25 | if(ZLIB_INCLUDE_DIRS) |
| 26 | # CMake 3 |
| 27 | -- |
| 28 | 2.11.0 |
| 29 | |