diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-05-16 15:32:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 15:32:43 -0700 |
| commit | 97506776ac21e12823e3d4148b81925c15419436 (patch) | |
| tree | c7cae53a5794e92798ebd6c66f75a70f5026b7c1 | |
| parent | 1f8241c47ee27c72c7a2a8fc446401045e51d64c (diff) | |
| parent | 723225f52935b3f81b5de9f88b5de8dc72e005d5 (diff) | |
| download | vcpkg-97506776ac21e12823e3d4148b81925c15419436.tar.gz vcpkg-97506776ac21e12823e3d4148b81925c15419436.zip | |
Merge pull request #3510 from edmBernard/fix_rocksdb
[rocksdb] fix zlib findpackage
| -rw-r--r-- | ports/rocksdb/0004-zlib-findpackage.patch | 13 | ||||
| -rw-r--r-- | ports/rocksdb/portfile.cmake | 1 |
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" ) |