From: Andy Green Date: Tue, 25 Jul 2017 09:36:31 +0000 (+0800) Subject: http2: remove cmake option leave code in for now X-Git-Tag: accepted/tizen/4.0/unified/20171012.191640~23 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibwebsockets.git;a=commitdiff_plain;h=19a320a578da0858add44b1f5335050cbd5d0525 http2: remove cmake option leave code in for now https://github.com/warmcat/libwebsockets/issues/979 --- diff --git a/.travis.yml b/.travis.yml index 55cb766..3f5293c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ env: - LWS_METHOD=noext CMAKE_ARGS="-DLWS_WITHOUT_EXTENSIONS=ON" - LWS_METHOD=libev CMAKE_ARGS="-DLWS_WITH_LIBEV=ON" - LWS_METHOD=noipv6 CMAKE_ARGS="-DLWS_IPV6=OFF" - - LWS_METHOD=http2 CMAKE_ARGS="-DLWS_WITH_HTTP2=ON" - LWS_METHOD=nossl CMAKE_ARGS="-DLWS_WITH_SSL=OFF" - LWS_METHOD=nodaemon CMAKE_ARGS="-DLWS_WITHOUT_DAEMONIZE=ON" - LWS_METHOD=cgi CMAKE_ARGS="-DLWS_WITH_CGI=ON" diff --git a/CMakeLists.txt b/CMakeLists.txt index e784ae2..aed2ee6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ option(LWS_WITH_LATENCY "Build latency measuring code into the library" OFF) option(LWS_WITHOUT_DAEMONIZE "Don't build the daemonization api" ON) option(LWS_IPV6 "Compile with support for ipv6" OFF) option(LWS_UNIX_SOCK "Compile with support for UNIX domain socket" OFF) -option(LWS_WITH_HTTP2 "Compile with support for http2" OFF) +#option(LWS_WITH_HTTP2 "Compile with support for http2" OFF) option(LWS_SSL_SERVER_WITH_ECDH_CERT "Include SSL server use ECDH certificate" OFF) option(LWS_WITH_CGI "Include CGI (spawn process with network-connected stdin/out/err) APIs" OFF) option(LWS_WITH_HTTP_PROXY "Support for rewriting HTTP proxying (requires libhubbub)" OFF)