Explorar o código

rm http2 headers

ithewei %!s(int64=4) %!d(string=hai) anos
pai
achega
1f89848af2
Modificáronse 4 ficheiros con 15 adicións e 4 borrados
  1. 3 0
      CMakeLists.txt
  2. 4 0
      Makefile
  3. 3 2
      Makefile.vars
  4. 5 2
      cmake/vars.cmake

+ 3 - 0
CMakeLists.txt

@@ -170,6 +170,9 @@ if(WITH_EVPP)
     if(WITH_HTTP)
         set(LIBHV_HEADERS ${LIBHV_HEADERS} ${HTTP_HEADERS})
         set(LIBHV_SRCDIRS ${LIBHV_SRCDIRS} http)
+        if(WITH_NGHTTP2)
+            set(LIBHV_HEADERS ${LIBHV_HEADERS} ${HTTP2_HEADERS})
+        endif()
         if(WITH_HTTP_SERVER)
             set(LIBHV_HEADERS ${LIBHV_HEADERS} ${HTTP_SERVER_HEADERS})
             set(LIBHV_SRCDIRS ${LIBHV_SRCDIRS} http/server)

+ 4 - 0
Makefile

@@ -25,6 +25,10 @@ ifeq ($(WITH_HTTP), yes)
 LIBHV_HEADERS += $(HTTP_HEADERS)
 LIBHV_SRCDIRS += http
 
+ifeq ($(WITH_NGHTTP2), yes)
+LIBHV_HEADERS += $(HTTP2_HEADERS)
+endif
+
 ifeq ($(WITH_HTTP_SERVER), yes)
 LIBHV_HEADERS += $(HTTP_SERVER_HEADERS)
 LIBHV_SRCDIRS += http/server

+ 3 - 2
Makefile.vars

@@ -68,8 +68,6 @@ PROTOCOL_HEADERS =  protocol/icmp.h\
 					protocol/smtp.h
 
 HTTP_HEADERS =  http/httpdef.h\
-				http/http2def.h\
-				http/grpcdef.h\
 				http/wsdef.h\
 				http/http_content.h\
 				http/HttpMessage.h\
@@ -77,6 +75,9 @@ HTTP_HEADERS =  http/httpdef.h\
 				http/WebSocketParser.h\
 				http/WebSocketChannel.h\
 
+HTTP2_HEADERS = http/http2def.h\
+				http/grpcdef.h\
+
 HTTP_CLIENT_HEADERS =   http/client/http_client.h\
 						http/client/requests.h\
 						http/client/axios.h\

+ 5 - 2
cmake/vars.cmake

@@ -75,8 +75,6 @@ set(PROTOCOL_HEADERS
 
 set(HTTP_HEADERS
     http/httpdef.h
-    http/http2def.h
-    http/grpcdef.h
     http/wsdef.h
     http/http_content.h
     http/HttpMessage.h
@@ -85,6 +83,11 @@ set(HTTP_HEADERS
     http/WebSocketChannel.h
 )
 
+set(HTTP2_HEADERS
+    http/http2def.h
+    http/grpcdef.h
+)
+
 set(HTTP_CLIENT_HEADERS
     http/client/http_client.h
     http/client/requests.h