aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwan BERNARD <bernard.erwan@gmail.com>2018-05-05 20:01:14 +0200
committerErwan BERNARD <bernard.erwan@gmail.com>2018-05-16 08:15:01 +0200
commit723225f52935b3f81b5de9f88b5de8dc72e005d5 (patch)
treef207cb457850b3fe4fee8aa39c3379c787dbf38c
parent52f01eefa6e1da7a9458807a1eb3d288ecd50613 (diff)
downloadvcpkg-723225f52935b3f81b5de9f88b5de8dc72e005d5.tar.gz
vcpkg-723225f52935b3f81b5de9f88b5de8dc72e005d5.zip
[rocksdb] fix zlib findpackage
-rw-r--r--ports/rocksdb/0004-zlib-findpackage.patch13
-rw-r--r--ports/rocksdb/portfile.cmake1
2 files changed, 14 insertions, 0 deletions
diff --git a/ports/rocksdb/0004-zlib-findpackage.patch b/ports/rocksdb/0004-zlib-findpackage.patch
new file mode 100644
index 000000000..25182760d
--- /dev/null
+++ b/ports/rocksdb/0004-zlib-findpackage.patch
@@ -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})
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index 114ace627..95642b19f 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -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"
)