diff options
| -rw-r--r-- | apps/http-proxy/src/http_proxy.cc | 2 | ||||
| -rw-r--r-- | libtransport/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libtransport/src/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/apps/http-proxy/src/http_proxy.cc b/apps/http-proxy/src/http_proxy.cc index 4afa5b832..4484b5a1a 100644 --- a/apps/http-proxy/src/http_proxy.cc +++ b/apps/http-proxy/src/http_proxy.cc @@ -347,6 +347,8 @@ void HTTPProxy::stop() { for (auto& receiver : receivers_) { receiver->stopAndJoinThread(); } + + signals_.cancel(); } HTTPProxy::HTTPProxy(ClientParams& params, std::size_t n_thread) diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 67492cb11..16c28f390 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -146,9 +146,9 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") endif () list(APPEND LIBRARIES + ${HICN_LIBRARIES} ${LIBPARC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} - ${HICN_LIBRARIES} ${VPP_LIBRARIES} ${ANDROID_LIBRARIES} ${OPENSSL_LIBRARIES} diff --git a/libtransport/src/CMakeLists.txt b/libtransport/src/CMakeLists.txt index c92393775..c10f3da5a 100644 --- a/libtransport/src/CMakeLists.txt +++ b/libtransport/src/CMakeLists.txt @@ -67,7 +67,7 @@ if (DISABLE_SHARED_LIBRARIES) LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} ${LIBTRANSPORT_INCLUDE_DIRS} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} INSTALL_ROOT_DIR hicn/transport DEFINITIONS ${COMPILER_DEFINITIONS} ) @@ -79,7 +79,7 @@ else () LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} ${LIBTRANSPORT_INCLUDE_DIRS} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} INSTALL_ROOT_DIR hicn/transport DEFINITIONS ${COMPILER_DEFINITIONS} ) |