mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 03:29:01 +08:00
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index cdf73fa..9fea965 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -30,9 +30,6 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX reldbg)
|
||
|
|
# Add main tcp_pubsub library
|
||
|
|
add_subdirectory(tcp_pubsub)
|
||
|
|
|
||
|
|
-# Recycle dependency. It's header only and not in the API, so we add it with EXCLUDE_FOR_ALL, so it won't be installed
|
||
|
|
-add_subdirectory(thirdparty/recycle EXCLUDE_FROM_ALL)
|
||
|
|
-
|
||
|
|
# Generic samples
|
||
|
|
if (TCP_PUBSUB_BUILD_SAMPLES)
|
||
|
|
add_subdirectory(samples/performance_publisher)
|
||
|
|
diff --git a/tcp_pubsub/CMakeLists.txt b/tcp_pubsub/CMakeLists.txt
|
||
|
|
index d2a5777..772319a 100644
|
||
|
|
--- a/tcp_pubsub/CMakeLists.txt
|
||
|
|
+++ b/tcp_pubsub/CMakeLists.txt
|
||
|
|
@@ -10,8 +10,8 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||
|
|
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
|
||
|
|
|
||
|
|
find_package(Threads REQUIRED)
|
||
|
|
-find_package(asio REQUIRED)
|
||
|
|
-find_package(recycle REQUIRED)
|
||
|
|
+find_package(asio CONFIG REQUIRED)
|
||
|
|
+find_path(RECYCLE_INCLUDE_DIRS "recycle/no_locking_policy.hpp")
|
||
|
|
|
||
|
|
# Include GenerateExportHeader that will create export macros for us
|
||
|
|
include(GenerateExportHeader)
|
||
|
|
@@ -73,7 +73,6 @@ target_link_libraries(${PROJECT_NAME}
|
||
|
|
# Link header-only libs (asio & recycle) as described in this workaround:
|
||
|
|
# https://gitlab.kitware.com/cmake/cmake/-/issues/15415#note_633938
|
||
|
|
$<BUILD_INTERFACE:asio::asio>
|
||
|
|
- $<BUILD_INTERFACE:steinwurf::recycle>
|
||
|
|
)
|
||
|
|
|
||
|
|
target_compile_definitions(${PROJECT_NAME}
|
||
|
|
@@ -100,6 +99,7 @@ target_include_directories(${PROJECT_NAME}
|
||
|
|
$<INSTALL_INTERFACE:include>
|
||
|
|
PRIVATE
|
||
|
|
src/
|
||
|
|
+ ${RECYCLE_INCLUDE_DIRS}
|
||
|
|
)
|
||
|
|
|
||
|
|
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||
|
|
@@ -177,4 +177,3 @@ install(
|
||
|
|
DESTINATION ${TCP_PUBSUB_INSTALL_CMAKE_DIR}
|
||
|
|
COMPONENT tcp_pubsub_dev
|
||
|
|
)
|
||
|
|
-
|