File tree Expand file tree Collapse file tree 1 file changed +12
-8
lines changed
plotjuggler_plugins/DataLoadMCAP Expand file tree Collapse file tree 1 file changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -3,12 +3,6 @@ add_definitions(-DQT_PLUGIN)
3
3
4
4
QT5_WRAP_UI ( UI_SRC dialog_mcap.ui )
5
5
6
- include (${PROJECT_SOURCE_DIR} /cmake/find_or_download_lz4.cmake )
7
- find_or_download_lz4 ()
8
-
9
- include (${PROJECT_SOURCE_DIR} /cmake/find_or_download_zstd.cmake )
10
- find_or_download_zstd ()
11
-
12
6
find_package (mcap_vendor QUIET )
13
7
14
8
if (mcap_vendor_FOUND )
@@ -17,6 +11,13 @@ if(mcap_vendor_FOUND)
17
11
else ()
18
12
message (STATUS "mcap_vendor not found. Will be downloaded with CPM." )
19
13
if (NOT TARGET mcap::mcap )
14
+
15
+ include (${PROJECT_SOURCE_DIR} /cmake/find_or_download_lz4.cmake )
16
+ find_or_download_lz4 ()
17
+
18
+ include (${PROJECT_SOURCE_DIR} /cmake/find_or_download_zstd.cmake )
19
+ find_or_download_zstd ()
20
+
20
21
### mcap ###
21
22
CPMAddPackage (
22
23
NAME mcap
@@ -29,6 +30,11 @@ else()
29
30
target_include_directories (mcap_lib
30
31
PUBLIC $< BUILD_INTERFACE:${mcap_SOURCE_DIR} /cpp/mcap/include>
31
32
)
33
+ target_link_libraries (mcap_lib
34
+ PUBLIC
35
+ lz4::lz4
36
+ zstd::zstd
37
+ )
32
38
add_library (mcap::mcap ALIAS mcap_lib )
33
39
endif ()
34
40
endif ()
@@ -47,8 +53,6 @@ target_link_libraries(DataLoadMCAP PRIVATE
47
53
${Qt5Xml_LIBRARIES}
48
54
${Qt5Concurrent_LIBRARIES}
49
55
plotjuggler_base
50
- lz4::lz4
51
- zstd::zstd
52
56
mcap::mcap
53
57
54
58
)
You can’t perform that action at this time.
0 commit comments