[ngtcp2] Update to 1.5.0 (#38274)

Disable Testing (via munit)
Remove build cunit parameter
Update no export patch
This commit is contained in:
Alexis La Goutte 2024-05-16 08:07:20 +02:00 committed by GitHub
parent 893a7f93c6
commit 66a252f70e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 18 deletions

View File

@ -1,8 +1,8 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f822c8e..591a588 100644
index b1b977af..eef6a1a6 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -69,8 +69,9 @@ set(ngtcp2_SOURCES
@@ -70,8 +70,9 @@ set(ngtcp2_SOURCES
)
set(ngtcp2_INCLUDE_DIRS
@ -14,7 +14,7 @@ index f822c8e..591a588 100644
)
# Public shared library
@@ -85,6 +86,7 @@ if(ENABLE_SHARED_LIB)
@@ -86,6 +87,7 @@ if(ENABLE_SHARED_LIB)
target_include_directories(ngtcp2 PUBLIC ${ngtcp2_INCLUDE_DIRS})
install(TARGETS ngtcp2
@ -22,22 +22,23 @@ index f822c8e..591a588 100644
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
@@ -102,10 +104,18 @@ if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
@@ -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})
if(ENABLE_STATIC_LIB)
+ 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()
-
+ 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")

View File

@ -2,8 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ngtcp2/ngtcp2
REF "v${VERSION}"
SHA512 3d266b80fbc44bf0711f4791db4787d80c989beb84ff4fe33e0f8fd25b8bb6d6d768bcbf990ca4bde0bcbaad5c7566bfb6a431b5bbec844247d8a4b417d451d9
HEAD_REF master
SHA512 8be12732e27eaabfbedae83ceee66ae0a269edebc614a5dd7645b8019d1f394be91391943baade93bad71e6100e22e46240b2b01c97ba3dedd7ef343113351e1
HEAD_REF main
PATCHES
export-unofficical-target.patch
)
@ -16,10 +16,10 @@ vcpkg_cmake_configure(
OPTIONS
"-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}"
"-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}"
-DBUILD_TESTING=OFF
-DENABLE_OPENSSL=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON
-DCMAKE_INSTALL_DOCDIR=share/ngtcp2
)
vcpkg_cmake_install()

View File

@ -1,6 +1,6 @@
{
"name": "ngtcp2",
"version": "1.2.0",
"version": "1.5.0",
"description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.",
"homepage": "https://github.com/ngtcp2/ngtcp2",
"license": "MIT",

View File

@ -6141,7 +6141,7 @@
"port-version": 0
},
"ngtcp2": {
"baseline": "1.2.0",
"baseline": "1.5.0",
"port-version": 0
},
"nifly": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e84533ed07e21e33b38553c3b75abd9a65536e76",
"version": "1.5.0",
"port-version": 0
},
{
"git-tree": "afc1585394c775f2989331db3baaa1b2c7449516",
"version": "1.2.0",