mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:01:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[wangle] Fix dependency issue (#15400)

Browse Source
This commit is contained in:
Phoebe 2020-12-31 11:05:11 -08:00 committed by GitHub
parent e9e1e0898a
commit 30124253ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 81 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/wangle/CONTROL
View File

@ -1,5 +1,6 @@
Source: wangle
Version: 2020.10.19.00
Port-Version: 1
Homepage: https://github.com/facebook/wangle
Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context
Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.

12
ports/wangle/build.patch
View File

@ -1,12 +0,0 @@
diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
index 15dc8b6..ed8c79b 100644
--- a/wangle/CMakeLists.txt
+++ b/wangle/CMakeLists.txt
@@ -123,6 +123,7 @@ target_include_directories(
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
+ PRIVATE
${FIZZ_INCLUDE_DIR}
${FOLLY_INCLUDE_DIR}
${Boost_INCLUDE_DIR}

41
ports/wangle/fix-config-cmake.patch
View File

@ -1,19 +1,22 @@
diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in
index e50af54..a16cdbb 100644
--- a/wangle/cmake/wangle-config.cmake.in
+++ b/wangle/cmake/wangle-config.cmake.in
@@ -12,7 +12,13 @@
@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")
+
+find_package(folly CONFIG REQUIRED)
+find_package(fizz CONFIG REQUIRED)
+find_package(glog REQUIRED)
+find_package(Threads REQUIRED)
+find_package(Libevent CONFIG REQUIRED)
if (NOT TARGET wangle::wangle)
include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake")
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")

56
ports/wangle/fix_dependency.patch Normal file
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)

6
ports/wangle/portfile.cmake
View File

@ -7,10 +7,9 @@ vcpkg_from_github(
SHA512 1c21199225ebfe9a95391c2bb607412ebadc7aac326373e30dc9d49223a2437b382b4c3160fb2147a505bc2182f03f651c95f7c67f916e336ac81af76884f5fa
HEAD_REF master
PATCHES
build.patch
fix-config-cmake.patch
fix_dependency.patch
)
# message(FATAL_ERROR "patch")
vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}/wangle"
@ -39,6 +38,5 @@ file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test
)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
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)