early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,22 @@
diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in
index e50af54..e0fd0dc 100644
--- a/wangle/cmake/wangle-config.cmake.in
+++ b/wangle/cmake/wangle-config.cmake.in
@@ -12,7 +12,16 @@
@PACKAGE_INIT@
set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set_and_check(WANGLE_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@")
+set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle")
+
+include(CMakeFindDependencyMacro)
+find_dependency(folly REQUIRED)
+find_dependency(fizz REQUIRED)
+find_dependency(glog REQUIRED)
+find_dependency(Threads REQUIRED)
+find_dependency(Libevent REQUIRED)
+find_dependency(OpenSSL REQUIRED)
+find_dependency(double-conversion REQUIRED)
if (NOT TARGET wangle::wangle)
include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake")

View File

@@ -0,0 +1,56 @@
diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
index 8df7c76..f605f25 100644
--- a/wangle/CMakeLists.txt
+++ b/wangle/CMakeLists.txt
@@ -62,7 +62,7 @@ find_package(folly CONFIG REQUIRED)
find_package(fizz CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED)
find_package(OpenSSL REQUIRED)
-find_package(Glog REQUIRED)
+find_package(glog CONFIG REQUIRED)
find_package(gflags CONFIG QUIET)
if (gflags_FOUND)
message(STATUS "Found gflags from package config")
@@ -70,8 +70,8 @@ if (gflags_FOUND)
else()
find_package(Gflags REQUIRED)
endif()
-find_package(LibEvent MODULE REQUIRED)
-find_package(DoubleConversion REQUIRED)
+find_package(Libevent CONFIG REQUIRED)
+find_package(double-conversion CONFIG REQUIRED)
find_package(Threads REQUIRED)
if (UNIX AND NOT APPLE)
find_package(Librt)
@@ -153,24 +153,23 @@ target_include_directories(
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
+ PRIVATE
${FIZZ_INCLUDE_DIR}
${FOLLY_INCLUDE_DIR}
${Boost_INCLUDE_DIR}
- ${OPENSSL_INCLUDE_DIR}
- ${GLOG_INCLUDE_DIRS}
${GFLAGS_INCLUDE_DIRS}
- ${LIBEVENT_INCLUDE_DIR}
- ${DOUBLE_CONVERSION_INCLUDE_DIRS}
)
target_link_libraries(wangle PUBLIC
${FOLLY_LIBRARIES}
${FIZZ_LIBRARIES}
${Boost_LIBRARIES}
- ${OPENSSL_LIBRARIES}
- ${GLOG_LIBRARIES}
+ OpenSSL::SSL
+ OpenSSL::Crypto
+ glog::glog
${GFLAGS_LIBRARIES}
- ${LIBEVENT_LIB}
- ${DOUBLE_CONVERSION_LIBRARIES}
+ libevent::core
+ libevent::extra
+ double-conversion::double-conversion
${CMAKE_DL_LIBS}
${LIBRT_LIBRARIES}
Threads::Threads)

41
externals/vcpkg/ports/wangle/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,41 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle
REF v2022.03.21.00
SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e
HEAD_REF master
PATCHES
fix-config-cmake.patch
fix_dependency.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/wangle"
OPTIONS
-DBUILD_TESTS=OFF
-DBUILD_EXAMPLES=OFF
-DINCLUDE_INSTALL_DIR:STRING=include
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wangle)
file(READ "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" _contents)
STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" "${_contents}")
vcpkg_copy_pdbs()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/include/wangle/util/test"
"${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs"
"${CURRENT_PACKAGES_DIR}/include/wangle/service/test"
"${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test"
)
file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

4
externals/vcpkg/ports/wangle/usage vendored Executable file
View File

@@ -0,0 +1,4 @@
The package wangle is compatible with built-in CMake targets:
find_package(wangle REQUIRED)
target_link_libraries(main PRIVATE wangle::wangle)

28
externals/vcpkg/ports/wangle/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,28 @@
{
"name": "wangle",
"version-string": "2022.03.21.00",
"description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.",
"homepage": "https://github.com/facebook/wangle",
"license": "Apache-2.0",
"dependencies": [
"boost-context",
"boost-filesystem",
"boost-regex",
"boost-system",
"boost-thread",
"double-conversion",
"fizz",
"folly",
"glog",
"libevent",
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}