Merge pull request #3510 from edmBernard/fix_rocksdb

[rocksdb] fix zlib findpackage
This commit is contained in:
Alexander Karatarakis 2018-05-16 15:32:43 -07:00 committed by GitHub
commit 97506776ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb3b126..45ca7b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,7 @@ else()
endif()
if(WITH_ZLIB)
- find_package(zlib REQUIRED)
+ find_package(ZLIB REQUIRED)
add_definitions(-DZLIB)
include_directories(${ZLIB_INCLUDE_DIR})
list(APPEND THIRDPARTY_LIBS ${ZLIB_LIBRARIES})

View File

@ -13,6 +13,7 @@ vcpkg_apply_patches(
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/0002-disable-gtest.patch"
"${CMAKE_CURRENT_LIST_DIR}/0003-only-build-one-flavor.patch"
"${CMAKE_CURRENT_LIST_DIR}/0004-zlib-findpackage.patch"
"${CMAKE_CURRENT_LIST_DIR}/use-find-package.patch"
"${CMAKE_CURRENT_LIST_DIR}/pass-major-version.patch"
)