Skip to content

Commit 769dda8

Browse files
authored
Merge remote-tracking branch 'origin/main' into feat/transform-editor
# Conflicts: # SDK_VERSION # extern/plotjuggler_core
2 parents 7aecb95 + 8955b92 commit 769dda8

7 files changed

Lines changed: 734 additions & 5 deletions

File tree

SDK_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.9.0
1+
0.10.0

parser_protobuf/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/EmbedUi.cmake)
55
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/EmbedManifest.cmake)
66

77
# --- Plugin shared library ---
8-
add_library(parser_protobuf_plugin SHARED protobuf_parser.cpp foxglove_pointcloud_codec.cpp foxglove_object_codecs.cpp)
8+
add_library(parser_protobuf_plugin SHARED protobuf_parser.cpp foxglove_pointcloud_codec.cpp foxglove_object_codecs.cpp foxglove_voxelgrid_codec.cpp)
99
target_compile_features(parser_protobuf_plugin PRIVATE cxx_std_20)
1010
target_compile_options(parser_protobuf_plugin PRIVATE ${PJ_WARNING_FLAGS})
1111
target_link_libraries(parser_protobuf_plugin PRIVATE plotjuggler_sdk::plugin_sdk protobuf::libprotobuf protobuf::libprotoc nlohmann_json::nlohmann_json pj_base64 pj_array_policy pj_laser_scan)
@@ -43,7 +43,7 @@ if(APPLE)
4343
endif()
4444

4545
# --- Integration test (loads plugin .so via host library) ---
46-
add_executable(protobuf_parser_test tests/protobuf_parser_test.cpp foxglove_pointcloud_codec.cpp foxglove_object_codecs.cpp)
46+
add_executable(protobuf_parser_test tests/protobuf_parser_test.cpp foxglove_pointcloud_codec.cpp foxglove_object_codecs.cpp foxglove_voxelgrid_codec.cpp)
4747
target_compile_features(protobuf_parser_test PRIVATE cxx_std_20)
4848
target_compile_options(protobuf_parser_test PRIVATE ${PJ_WARNING_FLAGS})
4949
target_compile_definitions(protobuf_parser_test PRIVATE

0 commit comments

Comments
 (0)