crosstyan/cvmmap-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(build): move vendored deps to third_party

Browse Source
This commit is contained in:
crosstyan
2026-03-16 15:18:43 +08:00
parent 8ad7dd05a1
commit ee8ff747ea
71 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+12 -35
View File
@@ -25,9 +25,7 @@ find_package(Protobuf REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(rvl CONFIG QUIET)
if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/lib/CLI11/CMakeLists.txt")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/lib/CLI11" "${CMAKE_CURRENT_BINARY_DIR}/vendor/cli11")
endif()
add_subdirectory(third_party)
pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec libavformat libavutil libswscale)
pkg_check_modules(PROTOBUF_PKG QUIET IMPORTED_TARGET protobuf)
@@ -64,11 +62,6 @@ if (NOT TARGET rvl::rvl)
endif()
endif()
set(CVMMAP_PROXY_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/proxy/include")
if (NOT EXISTS "${CVMMAP_PROXY_INCLUDE_DIR}/proxy/proxy.h")
message(FATAL_ERROR "proxy headers not found at ${CVMMAP_PROXY_INCLUDE_DIR}")
endif()
add_library(cvmmap_streamer_foxglove_proto STATIC)
protobuf_generate(
TARGET cvmmap_streamer_foxglove_proto
@@ -109,10 +102,10 @@ target_link_libraries(cvmmap_streamer_depth_proto PUBLIC cvmmap_streamer_protobu
add_library(cvmmap_streamer_mcap_runtime STATIC
src/record/mcap_runtime.cpp)
target_include_directories(cvmmap_streamer_mcap_runtime
PUBLIC
"${CMAKE_CURRENT_LIST_DIR}/lib/mcap/include")
PUBLIC)
target_link_libraries(cvmmap_streamer_mcap_runtime
PUBLIC
mcap::mcap
PkgConfig::ZSTD
PkgConfig::LZ4)
@@ -135,10 +128,6 @@ add_library(cvmmap_streamer_common STATIC
target_include_directories(cvmmap_streamer_common
PUBLIC
"${CMAKE_CURRENT_LIST_DIR}/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/CLI11/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/tomlplusplus/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/mcap/include"
"${CVMMAP_PROXY_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
set(CVMMAP_STREAMER_LINK_DEPS
@@ -150,7 +139,11 @@ set(CVMMAP_STREAMER_LINK_DEPS
PkgConfig::ZSTD
PkgConfig::LZ4
rvl::rvl
cvmmap::client)
cvmmap::client
CLI11::CLI11
tomlplusplus::tomlplusplus
mcap::mcap
msft_proxy4::proxy)
if (TARGET cppzmq::cppzmq)
list(APPEND CVMMAP_STREAMER_LINK_DEPS cppzmq::cppzmq)
@@ -170,10 +163,6 @@ elseif (TARGET spdlog)
list(APPEND CVMMAP_STREAMER_LINK_DEPS spdlog)
endif()
if (TARGET CLI11::CLI11)
list(APPEND CVMMAP_STREAMER_LINK_DEPS CLI11::CLI11)
endif()
list(APPEND CVMMAP_STREAMER_LINK_DEPS cvmmap_streamer_protobuf)
if (TARGET PkgConfig::PROTOBUF_PKG)
list(APPEND CVMMAP_STREAMER_LINK_DEPS PkgConfig::PROTOBUF_PKG)
@@ -186,10 +175,6 @@ function(add_cvmmap_binary target source)
target_include_directories(${target}
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/CLI11/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/tomlplusplus/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/mcap/include"
"${CVMMAP_PROXY_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
target_link_libraries(${target}
PRIVATE
@@ -213,15 +198,14 @@ add_executable(mcap_reader_tester src/testers/mcap_reader_tester.cpp)
target_include_directories(mcap_reader_tester
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/CLI11/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/mcap/include"
"${CVMMAP_PROXY_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
target_link_libraries(mcap_reader_tester
PRIVATE
CLI11::CLI11
cvmmap_streamer_foxglove_proto
cvmmap_streamer_depth_proto
cvmmap_streamer_mcap_runtime
mcap::mcap
PkgConfig::ZSTD
PkgConfig::LZ4)
if (TARGET spdlog::spdlog)
@@ -229,9 +213,6 @@ if (TARGET spdlog::spdlog)
elseif (TARGET spdlog)
target_link_libraries(mcap_reader_tester PRIVATE spdlog)
endif()
if (TARGET CLI11::CLI11)
target_link_libraries(mcap_reader_tester PRIVATE CLI11::CLI11)
endif()
target_link_libraries(mcap_reader_tester PRIVATE cvmmap_streamer_protobuf)
if (TARGET PkgConfig::PROTOBUF_PKG)
target_link_libraries(mcap_reader_tester PRIVATE PkgConfig::PROTOBUF_PKG)
@@ -244,15 +225,14 @@ add_executable(mcap_replay_tester src/testers/mcap_replay_tester.cpp)
target_include_directories(mcap_replay_tester
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/CLI11/include"
"${CMAKE_CURRENT_LIST_DIR}/lib/mcap/include"
"${CVMMAP_PROXY_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
target_link_libraries(mcap_replay_tester
PRIVATE
Threads::Threads
CLI11::CLI11
cvmmap_streamer_foxglove_proto
cvmmap_streamer_mcap_runtime
mcap::mcap
PkgConfig::ZSTD
PkgConfig::LZ4)
if (TARGET spdlog::spdlog)
@@ -260,9 +240,6 @@ if (TARGET spdlog::spdlog)
elseif (TARGET spdlog)
target_link_libraries(mcap_replay_tester PRIVATE spdlog)
endif()
if (TARGET CLI11::CLI11)
target_link_libraries(mcap_replay_tester PRIVATE CLI11::CLI11)
endif()
target_link_libraries(mcap_replay_tester PRIVATE cvmmap_streamer_protobuf)
if (TARGET PkgConfig::PROTOBUF_PKG)
target_link_libraries(mcap_replay_tester PRIVATE PkgConfig::PROTOBUF_PKG)