yuzu/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg synced 2024-11-21 16:09:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[folly] change FastFloat dependency to config (#42125)

Browse source
This commit is contained in:
Jia Yue Hua 2024-11-14 18:32:49 +08:00 committed by GitHub
parent b89e291b45
commit 2cb4f3ebd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ports/folly/fix-deps.patch
View file

@ -1,8 +1,8 @@
diff --git a/CMake/folly-config.cmake.in b/CMake/folly-config.cmake.in
index 0b96f0a10..ce7ce6b3f 100644
index 0b96f0a..34f5b53 100644
--- a/CMake/folly-config.cmake.in
+++ b/CMake/folly-config.cmake.in
@@ -29,10 +29,30 @@ endif()
@@ -29,10 +29,31 @@ endif()
set(FOLLY_LIBRARIES Folly::folly)
# Find folly's dependencies
@ -12,6 +12,7 @@ index 0b96f0a10..ce7ce6b3f 100644
+find_dependency(glog CONFIG)
+find_dependency(gflags CONFIG)
+find_dependency(Libevent CONFIG)
+find_dependency(FastFloat CONFIG)
+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_Zstd@)
+ find_dependency(zstd CONFIG)
+endif()
@ -36,7 +37,7 @@ index 0b96f0a10..ce7ce6b3f 100644
context
filesystem
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index d51f11128..776102d4d 100644
index 6ce4c67..701bb55 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -35,7 +35,7 @@ else()
@ -48,7 +49,7 @@ index d51f11128..776102d4d 100644
COMPONENTS
context
filesystem
@@ -45,40 +45,40 @@ find_package(Boost 1.51.0 MODULE
@@ -45,40 +45,41 @@ find_package(Boost 1.51.0 MODULE
thread
REQUIRED
)
@ -59,10 +60,10 @@ index d51f11128..776102d4d 100644
-find_package(DoubleConversion MODULE REQUIRED)
-list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
find_package(FastFloat MODULE REQUIRED)
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${FASTFLOAT_INCLUDE_DIR})
-
-find_package(FastFloat MODULE REQUIRED)
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${FASTFLOAT_INCLUDE_DIR})
-
-find_package(Gflags MODULE)
-set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
-if(LIBGFLAGS_FOUND)
@ -70,9 +71,20 @@ index d51f11128..776102d4d 100644
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
- set(FOLLY_LIBGFLAGS_LIBRARY ${LIBGFLAGS_LIBRARY})
- set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
-endif()
+
+
+find_package(double-conversion CONFIG REQUIRED)
+list(APPEND FOLLY_LINK_LIBRARIES double-conversion::double-conversion)
+
+find_package(FastFloat CONFIG REQUIRED)
+list(APPEND FOLLY_LINK_LIBRARIES FastFloat::fast_float)
+
+find_package(gflags CONFIG)
+if(TARGET gflags::gflags)
+ set(FOLLY_HAVE_LIBGFLAGS 1)
+ list(APPEND FOLLY_LINK_LIBRARIES gflags::gflags)
+ set(FOLLY_LIBGFLAGS_LIBRARY gflags::gflags)
endif()
-find_package(Glog MODULE)
-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
@ -85,11 +97,10 @@ index d51f11128..776102d4d 100644
-find_package(LibEvent MODULE REQUIRED)
-list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+find_package(gflags CONFIG)
+if(TARGET gflags::gflags)
+ set(FOLLY_HAVE_LIBGFLAGS 1)
+ list(APPEND FOLLY_LINK_LIBRARIES gflags::gflags)
+ set(FOLLY_LIBGFLAGS_LIBRARY gflags::gflags)
+find_package(Libevent CONFIG REQUIRED)
+list(APPEND FOLLY_LINK_LIBRARIES libevent::core libevent::extra)
+if(NOT WIN32)
+ list(APPEND FOLLY_LINK_LIBRARIES libevent::pthreads)
+endif()
-find_package(ZLIB MODULE)
@ -98,12 +109,6 @@ index d51f11128..776102d4d 100644
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
- list(APPEND FOLLY_LINK_LIBRARIES ${ZLIB_LIBRARIES})
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
+find_package(Libevent CONFIG REQUIRED)
+list(APPEND FOLLY_LINK_LIBRARIES libevent::core libevent::extra)
+if(NOT WIN32)
+ list(APPEND FOLLY_LINK_LIBRARIES libevent::pthreads)
+endif()
+
+if (CMAKE_REQUIRE_FIND_PACKAGE_ZLIB)
+ find_package(ZLIB MODULE REQUIRED)
+ set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
@ -115,7 +120,7 @@ index d51f11128..776102d4d 100644
endif()
find_package(OpenSSL 1.1.1 MODULE REQUIRED)
@@ -106,25 +106,29 @@ if (LIBLZMA_FOUND)
@@ -106,25 +107,29 @@ if (LIBLZMA_FOUND)
list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()
@ -160,7 +165,7 @@ index d51f11128..776102d4d 100644
endif()
find_package(LibDwarf)
@@ -135,17 +139,24 @@ find_package(Libiberty)
@@ -135,17 +140,24 @@ find_package(Libiberty)
list(APPEND FOLLY_LINK_LIBRARIES ${LIBIBERTY_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBIBERTY_INCLUDE_DIRS})
@ -194,7 +199,7 @@ index d51f11128..776102d4d 100644
list(APPEND FOLLY_LINK_LIBRARIES ${CMAKE_DL_LIBS})
list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS})
@@ -156,10 +167,10 @@ if (PYTHON_EXTENSIONS)
@@ -156,10 +168,10 @@ if (PYTHON_EXTENSIONS)
endif ()
find_package(LibUnwind)
@ -207,7 +212,7 @@ index d51f11128..776102d4d 100644
endif()
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
list(APPEND FOLLY_LINK_LIBRARIES "execinfo")
@@ -301,11 +312,7 @@ endif()
@@ -310,11 +322,7 @@ endif()
add_library(folly_deps INTERFACE)

6
ports/folly/fix-libunwind.patch
View file

@ -1,8 +1,8 @@
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 0702380..984c749 100644
index 701bb55..e41c128 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -99,6 +99,13 @@ if (BZIP2_FOUND)
@@ -100,6 +100,13 @@ if (BZIP2_FOUND)
list(APPEND FOLLY_LINK_LIBRARIES ${BZIP2_LIBRARIES})
endif()
@ -16,7 +16,7 @@ index 0702380..984c749 100644
find_package(LibLZMA MODULE)
set(FOLLY_HAVE_LIBLZMA ${LIBLZMA_FOUND})
if (LIBLZMA_FOUND)
@@ -166,12 +173,6 @@ if (PYTHON_EXTENSIONS)
@@ -167,12 +174,6 @@ if (PYTHON_EXTENSIONS)
find_package(Cython 0.26 REQUIRED)
endif ()

1
ports/folly/portfile.cmake
View file

@ -20,6 +20,7 @@ vcpkg_from_github(
fix-libunwind.patch
)
file(REMOVE "${SOURCE_PATH}/CMake/FindFastFloat.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindLibsodium.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindZstd.cmake")

1
ports/folly/vcpkg.json
View file

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

2
versions/baseline.json
View file

@ -2870,7 +2870,7 @@
},
"folly": {
"baseline": "2024.11.04.00",
"port-version": 0
"port-version": 1
},
"font-chef": {
"baseline": "1.1.0",

5
versions/f-/folly.json
View file

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9ca09c920d702b4156f710daf3b17ebb439bc8ba",
"version-string": "2024.11.04.00",
"port-version": 1
},
{
"git-tree": "399b1bcab72dccdda31bd83e2873b9cc2cf292bf",
"version-string": "2024.11.04.00",