From 3448bc6f6176ff5da20293a30e516fe2c1fe90be Mon Sep 17 00:00:00 2001 From: Markus Pilman Date: Mon, 27 Jun 2022 19:11:24 -0600 Subject: [PATCH] fix fdbmonitor --- fdbclient/CMakeLists.txt | 1 + fdbmonitor/CMakeLists.txt | 4 +++- fdbrpc/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt index 3e640febf8..37906fc300 100644 --- a/fdbclient/CMakeLists.txt +++ b/fdbclient/CMakeLists.txt @@ -86,6 +86,7 @@ target_link_libraries(fdbclient PUBLIC fdbrpc msgpack) # fdbserver retain sampling functionality in client code while disabling # sampling for pure clients. add_flow_target(STATIC_LIBRARY NAME fdbclient_sampling SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs}) +target_include_directories(fdbclient_sampling PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include") add_dependencies(fdbclient_sampling fdboptions) target_link_libraries(fdbclient_sampling PUBLIC fdbrpc_sampling msgpack) target_compile_definitions(fdbclient_sampling PRIVATE -DENABLE_SAMPLING) diff --git a/fdbmonitor/CMakeLists.txt b/fdbmonitor/CMakeLists.txt index b669d46846..177dde5170 100644 --- a/fdbmonitor/CMakeLists.txt +++ b/fdbmonitor/CMakeLists.txt @@ -1,7 +1,9 @@ set(FDBMONITOR_SRCS fdbmonitor.cpp) add_executable(fdbmonitor ${FDBMONITOR_SRCS}) -target_include_directories(fdbmonitor PUBLIC "${CMAKE_BINARY_DIR}/flow/include" "${CMAKE_BINARY_DIR}/fdbclient/include") +get_target_property(fdbclient_target_includes fdbclient INCLUDE_DIRECTORIES) +target_link_libraries(fdbmonitor PUBLIC SimpleOpt) +target_include_directories(fdbmonitor PUBLIC "${fdbclient_target_includes}") strip_debug_symbols(fdbmonitor) assert_no_version_h(fdbmonitor) if(UNIX AND NOT APPLE) diff --git a/fdbrpc/CMakeLists.txt b/fdbrpc/CMakeLists.txt index cf718d92b9..59ff66c3d5 100644 --- a/fdbrpc/CMakeLists.txt +++ b/fdbrpc/CMakeLists.txt @@ -56,10 +56,10 @@ if(${COROUTINE_IMPL} STREQUAL libcoro) endif() endif() -target_include_directories(fdbrpc PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libeio) +target_include_directories(fdbrpc PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libeio) target_link_libraries(fdbrpc PUBLIC flow PRIVATE rapidjson) -target_include_directories(fdbrpc_sampling PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libeio) +target_include_directories(fdbrpc_sampling PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libeio) target_link_libraries(fdbrpc_sampling PUBLIC flow_sampling PRIVATE rapidjson) if(${COROUTINE_IMPL} STREQUAL libcoro)