File tree Expand file tree Collapse file tree 1 file changed +14
-0
lines changed
Expand file tree Collapse file tree 1 file changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
77set (CMAKE_CXX_STANDARD 17)
88set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON )
99
10+ # Find system dependencies for mcap
11+ find_package (PkgConfig REQUIRED)
12+ pkg_check_modules(ZSTD REQUIRED libzstd)
13+ pkg_check_modules(LZ4 REQUIRED liblz4)
14+
1015if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME} )
1116 option (DATA_TAMER_BUILD_TESTS "Build tests" ON )
1217 option (DATA_TAMER_BUILD_EXAMPLES "Build examples" ON )
@@ -34,6 +39,15 @@ find_package(mcap QUIET)
3439if (NOT mcap_FOUND AND NOT DATA_TAMER_BUILD_ROS)
3540 set (USE_VENDORED_MCAP ON )
3641 message (STATUS "MCAP from 3rdparty" )
42+
43+ # Pass pkg-config variables to mcap subdirectory
44+ set (ZSTD_INCLUDE_DIR ${ZSTD_INCLUDE_DIRS} )
45+ set (ZSTD_LIBRARY ${ZSTD_LIBRARIES} )
46+ set (ZSTD_FOUND TRUE )
47+ set (LZ4_INCLUDE_DIR ${LZ4_INCLUDE_DIRS} )
48+ set (LZ4_LIBRARY ${LZ4_LIBRARIES} )
49+ set (LZ4_FOUND TRUE )
50+
3751 add_subdirectory (3rdparty/mcap)
3852 set (mcap_LIBRARY mcap_lib)
3953else ()
You can’t perform that action at this time.
0 commit comments