walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

cmake: sync with v1.8.0-63-g37b09f6 

Adds missing source files and configure.ac changes since
v1.7.0-93-g093eb51.
This commit is contained in:
Peter Wu 2016-03-13 16:19:23 +01:00
parent b092166bc6
commit 2ddb83206b
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -23,14 +23,14 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
# XXX using 1.7.90 instead of 1.8.0-DEV # XXX using 1.8.90 instead of 1.9.0-DEV
project(nghttp2 VERSION 1.7.90) project(nghttp2 VERSION 1.8.90)
# See versioning rule: # See versioning rule:
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
set(LT_CURRENT 18) set(LT_CURRENT 19)
set(LT_REVISION 1) set(LT_REVISION 0)
set(LT_AGE 4) set(LT_AGE 5)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(Version) include(Version)
@ -280,6 +280,13 @@ check_function_exists(accept4 HAVE_ACCEPT4)
include(CheckSymbolExists) include(CheckSymbolExists)
# XXX does this correctly detect initgroups (un)availability on cygwin? # XXX does this correctly detect initgroups (un)availability on cygwin?
check_symbol_exists(initgroups grp.h HAVE_DECL_INITGROUPS) check_symbol_exists(initgroups grp.h HAVE_DECL_INITGROUPS)
if(NOT HAVE_DECL_INITGROUPS AND HAVE_UNISTD_H)
# FreeBSD declares initgroups() in unistd.h
check_symbol_exists(initgroups unistd.h HAVE_DECL_INITGROUPS2)
if(HAVE_DECL_INITGROUPS2)
set(HAVE_DECL_INITGROUPS 1)
endif()
endif()
check_function_exists(timerfd_create HAVE_TIMERFD_CREATE) check_function_exists(timerfd_create HAVE_TIMERFD_CREATE)
# Checks for epoll availability, primarily for examples/tiny-nghttpd # Checks for epoll availability, primarily for examples/tiny-nghttpd
@ -341,6 +348,8 @@ if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-Wredundant-decls -Wredundant-decls
# Only work with Clang for the moment # Only work with Clang for the moment
-Wheader-guard -Wheader-guard
# This is required because we pass format string as "const char*.
-Wno-format-nonliteral
) )
extract_valid_cxx_flags(WARNCXXFLAGS extract_valid_cxx_flags(WARNCXXFLAGS

12
doc/CMakeLists.txt
View File

@ -25,37 +25,48 @@ set(APIDOCS
nghttp2_hd_inflate_hd.rst nghttp2_hd_inflate_hd.rst
nghttp2_hd_inflate_new.rst nghttp2_hd_inflate_new.rst
nghttp2_hd_inflate_new2.rst nghttp2_hd_inflate_new2.rst
nghttp2_http2_strerror.rst
nghttp2_is_fatal.rst nghttp2_is_fatal.rst
nghttp2_nv_compare_name.rst nghttp2_nv_compare_name.rst
nghttp2_option_del.rst nghttp2_option_del.rst
nghttp2_option_new.rst nghttp2_option_new.rst
nghttp2_option_set_max_reserved_remote_streams.rst nghttp2_option_set_max_reserved_remote_streams.rst
nghttp2_option_set_no_auto_ping_ack.rst
nghttp2_option_set_no_auto_window_update.rst nghttp2_option_set_no_auto_window_update.rst
nghttp2_option_set_no_http_messaging.rst nghttp2_option_set_no_http_messaging.rst
nghttp2_option_set_no_recv_client_magic.rst nghttp2_option_set_no_recv_client_magic.rst
nghttp2_option_set_peer_max_concurrent_streams.rst nghttp2_option_set_peer_max_concurrent_streams.rst
nghttp2_option_set_user_recv_extension_type.rst
nghttp2_pack_settings_payload.rst nghttp2_pack_settings_payload.rst
nghttp2_priority_spec_check_default.rst nghttp2_priority_spec_check_default.rst
nghttp2_priority_spec_default_init.rst nghttp2_priority_spec_default_init.rst
nghttp2_priority_spec_init.rst nghttp2_priority_spec_init.rst
nghttp2_rcbuf_decref.rst
nghttp2_rcbuf_get_buf.rst
nghttp2_rcbuf_incref.rst
nghttp2_select_next_protocol.rst nghttp2_select_next_protocol.rst
nghttp2_session_callbacks_del.rst nghttp2_session_callbacks_del.rst
nghttp2_session_callbacks_new.rst nghttp2_session_callbacks_new.rst
nghttp2_session_callbacks_set_before_frame_send_callback.rst nghttp2_session_callbacks_set_before_frame_send_callback.rst
nghttp2_session_callbacks_set_data_source_read_length_callback.rst nghttp2_session_callbacks_set_data_source_read_length_callback.rst
nghttp2_session_callbacks_set_error_callback.rst
nghttp2_session_callbacks_set_on_begin_frame_callback.rst nghttp2_session_callbacks_set_on_begin_frame_callback.rst
nghttp2_session_callbacks_set_on_begin_headers_callback.rst nghttp2_session_callbacks_set_on_begin_headers_callback.rst
nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst
nghttp2_session_callbacks_set_on_frame_not_send_callback.rst nghttp2_session_callbacks_set_on_frame_not_send_callback.rst
nghttp2_session_callbacks_set_on_frame_recv_callback.rst nghttp2_session_callbacks_set_on_frame_recv_callback.rst
nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst
nghttp2_session_callbacks_set_on_frame_send_callback.rst nghttp2_session_callbacks_set_on_frame_send_callback.rst
nghttp2_session_callbacks_set_on_header_callback.rst nghttp2_session_callbacks_set_on_header_callback.rst
nghttp2_session_callbacks_set_on_header_callback2.rst
nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst
nghttp2_session_callbacks_set_on_stream_close_callback.rst nghttp2_session_callbacks_set_on_stream_close_callback.rst
nghttp2_session_callbacks_set_pack_extension_callback.rst
nghttp2_session_callbacks_set_recv_callback.rst nghttp2_session_callbacks_set_recv_callback.rst
nghttp2_session_callbacks_set_select_padding_callback.rst nghttp2_session_callbacks_set_select_padding_callback.rst
nghttp2_session_callbacks_set_send_callback.rst nghttp2_session_callbacks_set_send_callback.rst
nghttp2_session_callbacks_set_send_data_callback.rst nghttp2_session_callbacks_set_send_data_callback.rst
nghttp2_session_callbacks_set_unpack_extension_callback.rst
nghttp2_session_client_new.rst nghttp2_session_client_new.rst
nghttp2_session_client_new2.rst nghttp2_session_client_new2.rst
nghttp2_session_client_new3.rst nghttp2_session_client_new3.rst
@ -107,6 +118,7 @@ set(APIDOCS
nghttp2_stream_get_weight.rst nghttp2_stream_get_weight.rst
nghttp2_strerror.rst nghttp2_strerror.rst
nghttp2_submit_data.rst nghttp2_submit_data.rst
nghttp2_submit_extension.rst
nghttp2_submit_goaway.rst nghttp2_submit_goaway.rst
nghttp2_submit_headers.rst nghttp2_submit_headers.rst
nghttp2_submit_ping.rst nghttp2_submit_ping.rst

1
lib/CMakeLists.txt
View File

@ -22,6 +22,7 @@ set(NGHTTP2_SOURCES
nghttp2_callbacks.c nghttp2_callbacks.c
nghttp2_mem.c nghttp2_mem.c
nghttp2_http.c nghttp2_http.c
nghttp2_rcbuf.c
) )
# Public shared library # Public shared library

1
src/CMakeLists.txt
View File

@ -145,6 +145,7 @@ if(ENABLE_APP)
shrpx_ssl_test.cc shrpx_ssl_test.cc
shrpx_downstream_test.cc shrpx_downstream_test.cc
shrpx_config_test.cc shrpx_config_test.cc
shrpx_worker_test.cc
shrpx_http_test.cc shrpx_http_test.cc
http2_test.cc http2_test.cc
util_test.cc util_test.cc