Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5864534

Browse filesBrowse files
nodejs-github-bottargos
nodejs-github-bot
authored and
targos
committed
deps: update nghttp2 to 1.60.0
PR-URL: #51948 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
1 parent 0dfe810 commit 5864534
Copy full SHA for 5864534
Expand file treeCollapse file tree

17 files changed

+1706
-362
lines changed
Open diff view settings
Collapse file

‎deps/nghttp2/lib/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: deps/nghttp2/lib/CMakeLists.txt
+46-23Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ set(NGHTTP2_SOURCES
3131
)
3232

3333
set(NGHTTP2_RES "")
34+
set(STATIC_LIB "nghttp2_static")
35+
set(SHARED_LIB "nghttp2")
3436

3537
if(WIN32)
3638
configure_file(
@@ -41,40 +43,61 @@ if(WIN32)
4143
set(NGHTTP2_RES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
4244
endif()
4345

46+
set(EXPORT_SET "${PROJECT_NAME}-targets")
47+
4448
# Public shared library
45-
if(ENABLE_SHARED_LIB)
46-
add_library(nghttp2 SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
47-
set_target_properties(nghttp2 PROPERTIES
49+
if(BUILD_SHARED_LIBS)
50+
add_library(${SHARED_LIB} SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
51+
52+
set_target_properties(${SHARED_LIB} PROPERTIES
4853
COMPILE_FLAGS "${WARNCFLAGS}"
4954
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
5055
C_VISIBILITY_PRESET hidden
5156
)
52-
target_include_directories(nghttp2 INTERFACE
53-
"${CMAKE_CURRENT_BINARY_DIR}/includes"
54-
"${CMAKE_CURRENT_SOURCE_DIR}/includes"
57+
58+
target_include_directories(${SHARED_LIB} INTERFACE
59+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/includes>
60+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/includes>
61+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
5562
)
5663

57-
install(TARGETS nghttp2
58-
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
59-
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
60-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
64+
install(TARGETS ${SHARED_LIB} EXPORT ${EXPORT_SET})
65+
list(APPEND nghttp2_exports ${SHARED_LIB})
6166
endif()
6267

63-
if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
64-
# Static library (for unittests because of symbol visibility)
65-
add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES})
66-
set_target_properties(nghttp2_static PROPERTIES
67-
COMPILE_FLAGS "${WARNCFLAGS}"
68-
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
69-
ARCHIVE_OUTPUT_NAME nghttp2${STATIC_LIB_SUFFIX}
70-
)
71-
target_compile_definitions(nghttp2_static PUBLIC "-DNGHTTP2_STATICLIB")
72-
if(ENABLE_STATIC_LIB)
73-
install(TARGETS nghttp2_static
74-
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
75-
endif()
68+
# Static library (for unittests because of symbol visibility)
69+
add_library(${STATIC_LIB} STATIC ${NGHTTP2_SOURCES})
70+
71+
set_target_properties(${STATIC_LIB} PROPERTIES
72+
COMPILE_FLAGS "${WARNCFLAGS}"
73+
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
74+
ARCHIVE_OUTPUT_NAME nghttp2${STATIC_LIB_SUFFIX}
75+
)
76+
77+
target_include_directories(${STATIC_LIB} INTERFACE
78+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/includes>
79+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/includes>
80+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
81+
)
82+
83+
target_compile_definitions(${STATIC_LIB} PUBLIC "-DNGHTTP2_STATICLIB")
84+
85+
if(BUILD_STATIC_LIBS)
86+
install(TARGETS ${STATIC_LIB} EXPORT ${EXPORT_SET})
87+
list(APPEND nghttp2_exports ${STATIC_LIB})
7688
endif()
7789

90+
if(BUILD_SHARED_LIBS)
91+
set(LIB_SELECTED ${SHARED_LIB})
92+
else()
93+
set(LIB_SELECTED ${STATIC_LIB})
94+
endif()
95+
96+
add_library(${PROJECT_NAME}::nghttp2 ALIAS ${LIB_SELECTED})
7897

7998
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc"
8099
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
100+
101+
install(EXPORT ${EXPORT_SET}
102+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
103+
NAMESPACE ${PROJECT_NAME}::)
Collapse file

‎deps/nghttp2/lib/Makefile.in‎

Copy file name to clipboardExpand all lines: deps/nghttp2/lib/Makefile.in
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,6 @@ CPP = @CPP@
306306
CPPFLAGS = @CPPFLAGS@
307307
CSCOPE = @CSCOPE@
308308
CTAGS = @CTAGS@
309-
CUNIT_CFLAGS = @CUNIT_CFLAGS@
310-
CUNIT_LIBS = @CUNIT_LIBS@
311309
CXX = @CXX@
312310
CXX1XCXXFLAGS = @CXX1XCXXFLAGS@
313311
CXXCPP = @CXXCPP@
@@ -345,6 +343,10 @@ LD = @LD@
345343
LDFLAGS = @LDFLAGS@
346344
LIBBPF_CFLAGS = @LIBBPF_CFLAGS@
347345
LIBBPF_LIBS = @LIBBPF_LIBS@
346+
LIBBROTLIDEC_CFLAGS = @LIBBROTLIDEC_CFLAGS@
347+
LIBBROTLIDEC_LIBS = @LIBBROTLIDEC_LIBS@
348+
LIBBROTLIENC_CFLAGS = @LIBBROTLIENC_CFLAGS@
349+
LIBBROTLIENC_LIBS = @LIBBROTLIENC_LIBS@
348350
LIBCARES_CFLAGS = @LIBCARES_CFLAGS@
349351
LIBCARES_LIBS = @LIBCARES_LIBS@
350352
LIBEVENT_OPENSSL_CFLAGS = @LIBEVENT_OPENSSL_CFLAGS@
Collapse file

‎deps/nghttp2/lib/includes/Makefile.in‎

Copy file name to clipboardExpand all lines: deps/nghttp2/lib/includes/Makefile.in
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ CPP = @CPP@
211211
CPPFLAGS = @CPPFLAGS@
212212
CSCOPE = @CSCOPE@
213213
CTAGS = @CTAGS@
214-
CUNIT_CFLAGS = @CUNIT_CFLAGS@
215-
CUNIT_LIBS = @CUNIT_LIBS@
216214
CXX = @CXX@
217215
CXX1XCXXFLAGS = @CXX1XCXXFLAGS@
218216
CXXCPP = @CXXCPP@
@@ -250,6 +248,10 @@ LD = @LD@
250248
LDFLAGS = @LDFLAGS@
251249
LIBBPF_CFLAGS = @LIBBPF_CFLAGS@
252250
LIBBPF_LIBS = @LIBBPF_LIBS@
251+
LIBBROTLIDEC_CFLAGS = @LIBBROTLIDEC_CFLAGS@
252+
LIBBROTLIDEC_LIBS = @LIBBROTLIDEC_LIBS@
253+
LIBBROTLIENC_CFLAGS = @LIBBROTLIENC_CFLAGS@
254+
LIBBROTLIENC_LIBS = @LIBBROTLIENC_LIBS@
253255
LIBCARES_CFLAGS = @LIBCARES_CFLAGS@
254256
LIBCARES_LIBS = @LIBCARES_LIBS@
255257
LIBEVENT_OPENSSL_CFLAGS = @LIBEVENT_OPENSSL_CFLAGS@

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.