[folly] Fix exported deps (#37930)

Fixes https://github.com/microsoft/vcpkg/issues/37837.
Alternative to #31768.
This commit is contained in:
Kai Pastor 2024-04-04 01:16:55 +02:00 committed by GitHub
parent dde88744e8
commit d7908750c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions

View File

@ -2,11 +2,12 @@ diff --git a/CMake/folly-config.cmake.in b/CMake/folly-config.cmake.in
index 1689f9a..e5d3e22 100644 index 1689f9a..e5d3e22 100644
--- a/CMake/folly-config.cmake.in --- a/CMake/folly-config.cmake.in
+++ b/CMake/folly-config.cmake.in +++ b/CMake/folly-config.cmake.in
@@ -28,10 +28,35 @@ endif() @@ -28,10 +28,30 @@ endif()
set(FOLLY_LIBRARIES Folly::folly) set(FOLLY_LIBRARIES Folly::folly)
# Find folly's dependencies # Find folly's dependencies
-find_dependency(fmt) -find_dependency(fmt)
+find_dependency(fmt CONFIG)
+find_dependency(double-conversion CONFIG) +find_dependency(double-conversion CONFIG)
+find_dependency(glog CONFIG) +find_dependency(glog CONFIG)
+find_dependency(gflags CONFIG) +find_dependency(gflags CONFIG)
@ -27,12 +28,6 @@ index 1689f9a..e5d3e22 100644
+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_LZ4@) +if (NOT @CMAKE_DISABLE_FIND_PACKAGE_LZ4@)
+ find_dependency(lz4 CONFIG) + find_dependency(lz4 CONFIG)
+endif() +endif()
+
+if (@WITH_liburing@)
+ find_dependency(LibUring)
+endif()
+
+find_dependency(fmt CONFIG)
set(Boost_USE_STATIC_LIBS "@FOLLY_BOOST_LINK_STATIC@") set(Boost_USE_STATIC_LIBS "@FOLLY_BOOST_LINK_STATIC@")
-find_dependency(Boost 1.51.0 MODULE -find_dependency(Boost 1.51.0 MODULE

View File

@ -1,7 +1,7 @@
{ {
"name": "folly", "name": "folly",
"version-string": "2024.01.01.00", "version-string": "2024.01.01.00",
"port-version": 2, "port-version": 3,
"description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
"homepage": "https://github.com/facebook/folly", "homepage": "https://github.com/facebook/folly",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -2774,7 +2774,7 @@
}, },
"folly": { "folly": {
"baseline": "2024.01.01.00", "baseline": "2024.01.01.00",
"port-version": 2 "port-version": 3
}, },
"font-chef": { "font-chef": {
"baseline": "1.1.0", "baseline": "1.1.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "e99a9ae70e66a41fc8bd159f89eba510d8dc2bc8",
"version-string": "2024.01.01.00",
"port-version": 3
},
{ {
"git-tree": "6498cc8e72c9193c4aacedadf34ad4477de5c657", "git-tree": "6498cc8e72c9193c4aacedadf34ad4477de5c657",
"version-string": "2024.01.01.00", "version-string": "2024.01.01.00",