Merge pull request #592 from Chilledheart/quiche_no_linkage_with_base

Chilledheart · Dec 27, 2023 · c636467 · c636467
2 parents 01c74dc + f715a2b
commit c636467
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2884,15 +2884,18 @@ elseif (USE_NGHTTP2)
     target_compile_options(nghttp2_static PRIVATE -Wno-extra-semi-stmt)
     target_compile_options(nghttp2_static PRIVATE -Wno-covered-switch-default)
   endif()
+  set(NGHTTP2_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/nghttp2/lib/includes
+    ${CMAKE_CURRENT_BINARY_DIR}/third_party/nghttp2/lib/includes
+    )
   set(NGHTTP2_LIBRARIES nghttp2_static)
   list(APPEND YASS_APP_FEATURES "nghttp2")
   set(SUPPORT_DEFINITIONS
     HAVE_NGHTTP2
     ${SUPPORT_DEFINITIONS}
   )
   set(SUPPORT_INCLUDE_DIRS
-    third_party/nghttp2/lib/includes
-    ${CMAKE_CURRENT_BINARY_DIR}/third_party/nghttp2/lib/includes
+    ${NGHTTP2_INCLUDE_DIRS}
     ${SUPPORT_INCLUDE_DIRS}
   )
   set(SUPPORT_LIBS

diff --git a/third_party/quiche/CMakeLists.txt b/third_party/quiche/CMakeLists.txt
@@ -741,7 +741,7 @@ target_link_libraries(quiche PUBLIC
   crypto
   ssl
   url
-  yass_base
+  asio
   absl::container_common
   absl::btree
   absl::flat_hash_map
@@ -768,6 +768,8 @@ target_link_libraries(quiche PUBLIC
   )
 
 if (USE_NGHTTP2)
+  target_include_directories(quiche PUBLIC ${NGHTTP2_INCLUDE_DIRS})
+  target_link_directories(quiche PUBLIC ${NGHTTP2_LIBRARY_DIRS})
   target_link_libraries(quiche PUBLIC ${NGHTTP2_LIBRARIES})
 endif()