mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[ngtcp2] Update to v1.7.0 (#40665)
This commit is contained in:
parent
fd4c30b55e
commit
a0de341dfc
@ -1,44 +0,0 @@
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index b1b977af..eef6a1a6 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -70,8 +70,9 @@ set(ngtcp2_SOURCES
|
||||
)
|
||||
|
||||
set(ngtcp2_INCLUDE_DIRS
|
||||
- "${CMAKE_CURRENT_SOURCE_DIR}/includes"
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/includes"
|
||||
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/includes>"
|
||||
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/includes>"
|
||||
+ "$<INSTALL_INTERFACE:include>"
|
||||
)
|
||||
|
||||
# Public shared library
|
||||
@@ -86,6 +87,7 @@ if(ENABLE_SHARED_LIB)
|
||||
target_include_directories(ngtcp2 PUBLIC ${ngtcp2_INCLUDE_DIRS})
|
||||
|
||||
install(TARGETS ngtcp2
|
||||
+ EXPORT unofficial-ngtcp2-config
|
||||
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||
@@ -102,10 +104,18 @@ if(ENABLE_STATIC_LIB)
|
||||
)
|
||||
target_compile_definitions(ngtcp2_static PUBLIC "-DNGTCP2_STATICLIB")
|
||||
target_include_directories(ngtcp2_static PUBLIC ${ngtcp2_INCLUDE_DIRS})
|
||||
-
|
||||
+ add_library(ngtcp2 INTERFACE)
|
||||
+ target_link_libraries(ngtcp2 INTERFACE ngtcp2_static)
|
||||
install(TARGETS ngtcp2_static
|
||||
+ ngtcp2
|
||||
+ EXPORT unofficial-ngtcp2-config
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||
endif()
|
||||
|
||||
+install(
|
||||
+ EXPORT unofficial-ngtcp2-config
|
||||
+ NAMESPACE unofficial::ngtcp2::
|
||||
+ DESTINATION share/unofficial-ngtcp2)
|
||||
+
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libngtcp2.pc"
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
@ -2,10 +2,9 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ngtcp2/ngtcp2
|
||||
REF "v${VERSION}"
|
||||
SHA512 15f9fad2d7a9181dcd3aa5d1873c6b58dd997c6a2782e1d45cb4630e22fb0caa218018376dc2ca4103c72d6a5b932ad0a7cf399665818e6181b3980200c8841a
|
||||
SHA512 891a7339122f60b1796bb24d29ab75d0316717c2a64a45bade805242b70cb8713abc7642cdf0ec646ab9e80085d65117f0ea9b1e671d76bcd54038b0ea9bc868
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
export-unofficical-target.patch
|
||||
openssl_required.patch
|
||||
)
|
||||
|
||||
@ -33,12 +32,11 @@ vcpkg_cmake_configure(
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-ngtcp2)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ngtcp2")
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
)
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
@ -1,4 +0,0 @@
|
||||
ngtcp2 provides CMake targets:
|
||||
|
||||
find_package(unofficial-ngtcp2 CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE unofficial::ngtcp2::ngtcp2)
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "ngtcp2",
|
||||
"version": "1.6.0",
|
||||
"port-version": 3,
|
||||
"version": "1.7.0",
|
||||
"description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.",
|
||||
"homepage": "https://github.com/ngtcp2/ngtcp2",
|
||||
"license": "MIT",
|
||||
|
@ -6245,8 +6245,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"ngtcp2": {
|
||||
"baseline": "1.6.0",
|
||||
"port-version": 3
|
||||
"baseline": "1.7.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"nifly": {
|
||||
"baseline": "1.0.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "909f14f6bf7e0e65f72114fed6c3deb990755ba6",
|
||||
"version": "1.7.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "192385868c5b3a7048f4496493e6fc55a564dbc8",
|
||||
"version": "1.6.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user