diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-03-14 01:08:42 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-13 10:08:42 -0700 |
| commit | 842d6169a6aaded4822c7c3c1c8c1e98ce8946e7 (patch) | |
| tree | bd2982cb7f18690fd7f6068a5b6f4b6e04bf97b3 | |
| parent | deae3465bc7ac4e01847fdc7d9ad420a4a8c73e2 (diff) | |
| download | vcpkg-842d6169a6aaded4822c7c3c1c8c1e98ce8946e7.tar.gz vcpkg-842d6169a6aaded4822c7c3c1c8c1e98ce8946e7.zip | |
[wangle]fix wangle-config.cmake bug (#5653)
| -rw-r--r-- | ports/wangle/CONTROL | 2 | ||||
| -rw-r--r-- | ports/wangle/fix-config-cmake.patch | 19 | ||||
| -rw-r--r-- | ports/wangle/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/wangle/usage | 5 |
4 files changed, 27 insertions, 1 deletions
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index 498eeb6cb..77df9ccf0 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle
-Version: 2019.01.07.00 +Version: 2019.01.07.00-1 Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion
Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
diff --git a/ports/wangle/fix-config-cmake.patch b/ports/wangle/fix-config-cmake.patch new file mode 100644 index 000000000..c72b70cdd --- /dev/null +++ b/ports/wangle/fix-config-cmake.patch @@ -0,0 +1,19 @@ +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 REQUIRED)
++find_package(fizz REQUIRED)
++find_package(glog REQUIRED)
++find_package(threads REQUIRED)
++find_package(libevent REQUIRED)
+
+ if (NOT TARGET wangle::wangle)
+ include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake")
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 6d1aac9f8..ce1672eb7 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES
build.patch
gflags.patch
+ fix-config-cmake.patch
)
vcpkg_configure_cmake(
@@ -35,3 +36,4 @@ file(REMOVE_RECURSE # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wangle RENAME copyright)
+file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/wangle)
diff --git a/ports/wangle/usage b/ports/wangle/usage new file mode 100644 index 000000000..768ff2d64 --- /dev/null +++ b/ports/wangle/usage @@ -0,0 +1,5 @@ +The package wangle is compatible with built-in CMake targets: + + find_package(wangle REQUIRED) + target_link_libraries(main PRIVATE wangle::wangle) + target_include_directories(main PRIVATE ${WANGLE_INCLUDE_DIR}) |