Commit ff5bd04
deps: update nghttp2 to 1.42.0
Refs: https://github.com/nghttp2/nghttp2/releases/tag/v1.42.0
PR-URL: #36842
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent cfdbb79 commit ff5bd04
15 files changed
Lines changed: 3109 additions & 78 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,77 @@ | |||
| 1 | + add_subdirectory(includes) | ||
| 2 | + | ||
| 3 | + include_directories( | ||
| 4 | + "${CMAKE_CURRENT_SOURCE_DIR}/includes" | ||
| 5 | + "${CMAKE_CURRENT_BINARY_DIR}/includes" | ||
| 6 | + ) | ||
| 7 | + | ||
| 8 | + add_definitions(-DBUILDING_NGHTTP2) | ||
| 9 | + | ||
| 10 | + set(NGHTTP2_SOURCES | ||
| 11 | + nghttp2_pq.c nghttp2_map.c nghttp2_queue.c | ||
| 12 | + nghttp2_frame.c | ||
| 13 | + nghttp2_buf.c | ||
| 14 | + nghttp2_stream.c nghttp2_outbound_item.c | ||
| 15 | + nghttp2_session.c nghttp2_submit.c | ||
| 16 | + nghttp2_helper.c | ||
| 17 | + nghttp2_npn.c | ||
| 18 | + nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c | ||
| 19 | + nghttp2_version.c | ||
| 20 | + nghttp2_priority_spec.c | ||
| 21 | + nghttp2_option.c | ||
| 22 | + nghttp2_callbacks.c | ||
| 23 | + nghttp2_mem.c | ||
| 24 | + nghttp2_http.c | ||
| 25 | + nghttp2_rcbuf.c | ||
| 26 | + nghttp2_debug.c | ||
| 27 | + nghttp2_ksl.c | ||
| 28 | + ) | ||
| 29 | + | ||
| 30 | + set(NGHTTP2_RES "") | ||
| 31 | + | ||
| 32 | + if(WIN32) | ||
| 33 | + configure_file( | ||
| 34 | + version.rc.in | ||
| 35 | + ${CMAKE_CURRENT_BINARY_DIR}/version.rc | ||
| 36 | + @ONLY) | ||
| 37 | + | ||
| 38 | + set(NGHTTP2_RES ${CMAKE_CURRENT_BINARY_DIR}/version.rc) | ||
| 39 | + endif() | ||
| 40 | + | ||
| 41 | + # Public shared library | ||
| 42 | + if(ENABLE_SHARED_LIB) | ||
| 43 | + add_library(nghttp2 SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES}) | ||
| 44 | + set_target_properties(nghttp2 PROPERTIES | ||
| 45 | + COMPILE_FLAGS "${WARNCFLAGS}" | ||
| 46 | + VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION} | ||
| 47 | + C_VISIBILITY_PRESET hidden | ||
| 48 | + ) | ||
| 49 | + target_include_directories(nghttp2 INTERFACE | ||
| 50 | + "${CMAKE_CURRENT_BINARY_DIR}/includes" | ||
| 51 | + "${CMAKE_CURRENT_SOURCE_DIR}/includes" | ||
| 52 | + ) | ||
| 53 | + | ||
| 54 | + install(TARGETS nghttp2 | ||
| 55 | + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| 56 | + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| 57 | + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| 58 | + endif() | ||
| 59 | + | ||
| 60 | + if(HAVE_CUNIT OR ENABLE_STATIC_LIB) | ||
| 61 | + # Static library (for unittests because of symbol visibility) | ||
| 62 | + add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES}) | ||
| 63 | + set_target_properties(nghttp2_static PROPERTIES | ||
| 64 | + COMPILE_FLAGS "${WARNCFLAGS}" | ||
| 65 | + VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION} | ||
| 66 | + ARCHIVE_OUTPUT_NAME nghttp2${STATIC_LIB_SUFFIX} | ||
| 67 | + ) | ||
| 68 | + target_compile_definitions(nghttp2_static PUBLIC "-DNGHTTP2_STATICLIB") | ||
| 69 | + if(ENABLE_STATIC_LIB) | ||
| 70 | + install(TARGETS nghttp2_static | ||
| 71 | + DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
| 72 | + endif() | ||
| 73 | + endif() | ||
| 74 | + | ||
| 75 | + | ||
| 76 | + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc" | ||
| 77 | + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -49,7 +49,8 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \ | |||
| 49 | 49 | nghttp2_mem.c \ | |
| 50 | 50 | nghttp2_http.c \ | |
| 51 | 51 | nghttp2_rcbuf.c \ | |
| 52 | - nghttp2_debug.c | ||
| 52 | + nghttp2_debug.c \ | ||
| 53 | + nghttp2_ksl.c | ||
| 53 | 54 | ||
| 54 | 55 | HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \ | |
| 55 | 56 | nghttp2_frame.h \ | |
@@ -65,7 +66,8 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \ | |||
| 65 | 66 | nghttp2_mem.h \ | |
| 66 | 67 | nghttp2_http.h \ | |
| 67 | 68 | nghttp2_rcbuf.h \ | |
| 68 | - nghttp2_debug.h | ||
| 69 | + nghttp2_debug.h \ | ||
| 70 | + nghttp2_ksl.h | ||
| 69 | 71 | ||
| 70 | 72 | libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS) | |
| 71 | 73 | libnghttp2_la_LDFLAGS = -no-undefined \ | |
0 commit comments