diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-29 18:53:22 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-30 15:24:36 -0700 |
| commit | eea766d2d0ea285541bfd753b68eaa8c3455304a (patch) | |
| tree | 419f32cf5dc678c8a34746ee8689788d36ce9ae5 /ports/folly | |
| parent | cf9987e21aee94cd4b4c991c6eb788ec87177923 (diff) | |
| download | vcpkg-eea766d2d0ea285541bfd753b68eaa8c3455304a.tar.gz vcpkg-eea766d2d0ea285541bfd753b68eaa8c3455304a.zip | |
[folly][rocksdb] Fix lz4+snappy support
Diffstat (limited to 'ports/folly')
| -rw-r--r-- | ports/folly/CONTROL | 2 | ||||
| -rw-r--r-- | ports/folly/FindLZ4.cmake | 7 | ||||
| -rw-r--r-- | ports/folly/FindSnappy.cmake | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 457874906..cb3a464af 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.03.19.00-1 +Version: 2018.03.19.00-2 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/FindLZ4.cmake b/ports/folly/FindLZ4.cmake index bf3140e15..f80962c66 100644 --- a/ports/folly/FindLZ4.cmake +++ b/ports/folly/FindLZ4.cmake @@ -1,9 +1,10 @@ find_path(LZ4_INCLUDE_DIR lz4.h)
-find_package(LZ4_LIBRARY_DEBUG NAMES lz4d)
-find_package(LZ4_LIBRARY_RELEASE NAMES lz4)
+find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
+find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
-select_library_configurations(LZ4_LIBRARY)
+include(SelectLibraryConfigurations)
+select_library_configurations(LZ4)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
diff --git a/ports/folly/FindSnappy.cmake b/ports/folly/FindSnappy.cmake index e8916d6e0..253d0d84c 100644 --- a/ports/folly/FindSnappy.cmake +++ b/ports/folly/FindSnappy.cmake @@ -1,9 +1,10 @@ find_path(SNAPPY_INCLUDE_DIR snappy.h)
-find_package(SNAPPY_LIBRARY_DEBUG NAMES snappyd)
-find_package(SNAPPY_LIBRARY_RELEASE NAMES snappy)
+find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd)
+find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy)
-select_library_configurations(SNAPPY_LIBRARY)
+include(SelectLibraryConfigurations)
+select_library_configurations(SNAPPY)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
|