fix fdbmonitor

This commit is contained in:
Markus Pilman 2022-06-27 19:11:24 -06:00
parent 7040cb9688
commit 3448bc6f61
3 changed files with 6 additions and 3 deletions

View File

@ -86,6 +86,7 @@ target_link_libraries(fdbclient PUBLIC fdbrpc msgpack)
# fdbserver retain sampling functionality in client code while disabling # fdbserver retain sampling functionality in client code while disabling
# sampling for pure clients. # sampling for pure clients.
add_flow_target(STATIC_LIBRARY NAME fdbclient_sampling SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs}) 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) add_dependencies(fdbclient_sampling fdboptions)
target_link_libraries(fdbclient_sampling PUBLIC fdbrpc_sampling msgpack) target_link_libraries(fdbclient_sampling PUBLIC fdbrpc_sampling msgpack)
target_compile_definitions(fdbclient_sampling PRIVATE -DENABLE_SAMPLING) target_compile_definitions(fdbclient_sampling PRIVATE -DENABLE_SAMPLING)

View File

@ -1,7 +1,9 @@
set(FDBMONITOR_SRCS fdbmonitor.cpp) set(FDBMONITOR_SRCS fdbmonitor.cpp)
add_executable(fdbmonitor ${FDBMONITOR_SRCS}) 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) strip_debug_symbols(fdbmonitor)
assert_no_version_h(fdbmonitor) assert_no_version_h(fdbmonitor)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)

View File

@ -56,10 +56,10 @@ if(${COROUTINE_IMPL} STREQUAL libcoro)
endif() endif()
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_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) target_link_libraries(fdbrpc_sampling PUBLIC flow_sampling PRIVATE rapidjson)
if(${COROUTINE_IMPL} STREQUAL libcoro) if(${COROUTINE_IMPL} STREQUAL libcoro)