blob: 1f8f2ce976137b10325532575b587da55c59f6fc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 984f38f..4c7b181 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,7 +268,7 @@ ELSE()
MESSAGE(STATUS "zlib not found")
ENDIF()
-SET(LIBS lsquic ${BORINGSSL_LIB_ssl} ${BORINGSSL_LIB_crypto} ${ZLIB_LIB} ${LIBS})
+SET(LIBS lsquic ls-hpack ls-qpack ${BORINGSSL_LIB_ssl} ${BORINGSSL_LIB_crypto} ${ZLIB_LIB} ${LIBS})
IF (LSQUIC_BIN)
FIND_PATH(EVENT_INCLUDE_DIR NAMES event2/event.h)
diff --git a/src/liblsquic/CMakeLists.txt b/src/liblsquic/CMakeLists.txt
index fe6307e..be9a432 100644
--- a/src/liblsquic/CMakeLists.txt
+++ b/src/liblsquic/CMakeLists.txt
@@ -1,6 +1,5 @@
# Copyright (c) 2017 - 2022 LiteSpeed Technologies Inc. See LICENSE.
SET(lsquic_STAT_SRCS
- ls-qpack/lsqpack.c
lsquic_adaptive_cc.c
lsquic_alarmset.c
lsquic_arr.c
@@ -91,18 +90,13 @@ IF(NOT MSVC)
IF (HAS_NO_IMPLICIT_FALLTHROUGH)
SET(QPACK_FLAGS "${QPACK_FLAGS} -Wno-implicit-fallthrough")
ENDIF()
-set_source_files_properties(ls-qpack/lsqpack.c PROPERTIES COMPILE_FLAGS ${QPACK_FLAGS})
ENDIF()
-include_directories(ls-qpack)
-
IF(PROJECT_NAME STREQUAL "openlitespeed")
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/spdy)
ELSE()
- INCLUDE_DIRECTORIES(../lshpack)
SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS}
lsquic_xxhash.c
- ../lshpack/lshpack.c
)
ENDIF()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fab22d3..06c39b3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,9 +17,6 @@ ELSE()
ENDIF()
ENDIF()
-include_directories(../src/liblsquic/ls-qpack)
-INCLUDE_DIRECTORIES(../src/lshpack)
-
SET(TESTS
ack
ackgen_gquic_be
|
