Use conan recipe foxglove-schemas-protobuf (#499)

### Public-Facing Changes Use conan recipe foxglove-schemas-protobuf ### Description Uses the foxglove-schemas-protobuf conan recipe added in conan-io/conan-center-index#17707.
foxglove · Jul 17, 2023 · 91a5f2b · 91a5f2b
1 parent e602d8a
commit 91a5f2b
Show file tree

Hide file tree

Showing 37 changed files with 7 additions and 1,007 deletions.
diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt
@@ -1,25 +1,10 @@
 cmake_minimum_required(VERSION 3.15)
 project(FoxgloveWebSocketExamples CXX)
 
-find_package(Protobuf 3 REQUIRED)
 find_package(FlatBuffers REQUIRED)
+find_package(foxglove-schemas-protobuf CONFIG REQUIRED)
 find_package(foxglove-websocket REQUIRED)
 
-FILE(GLOB all_protos "proto/foxglove/*.proto")
-
-FOREACH(f ${all_protos})
-    file(RELATIVE_PATH f ${CMAKE_CURRENT_SOURCE_DIR}/proto ${f})
-    STRING(REGEX REPLACE "\\.proto$" "" f ${f})
-    LIST(APPEND proto_sources "autogenerated_protobuf/${f}.pb.h")
-    LIST(APPEND proto_sources "autogenerated_protobuf/${f}.pb.cc")
-ENDFOREACH(f)
-
-add_custom_command(
-    OUTPUT ${proto_sources}
-    COMMAND ${CMAKE_COMMAND} -E make_directory autogenerated_protobuf
-    COMMAND ${Protobuf_PROTOC_EXECUTABLE} --proto_path=${CMAKE_CURRENT_SOURCE_DIR}/proto --cpp_out=autogenerated_protobuf ${all_protos}
-)
-
 FILE(GLOB flatbuffers_schemas "flatbuffers/*.fbs")
 build_flatbuffers(
     "${flatbuffers_schemas}" # flatbuffers_schemas
@@ -31,9 +16,11 @@ build_flatbuffers(
     "" # copy_text_schemas_dir
 )
 
-add_executable(example_server_protobuf src/example_server_protobuf.cpp ${proto_sources})
-target_include_directories(example_server_protobuf PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/autogenerated_protobuf)
-target_link_libraries(example_server_protobuf foxglove-websocket::foxglove-websocket protobuf::libprotobuf)
+add_executable(example_server_protobuf src/example_server_protobuf.cpp)
+target_link_libraries(example_server_protobuf
+    foxglove-schemas-protobuf::foxglove-schemas-protobuf
+    foxglove-websocket::foxglove-websocket
+)
 
 add_executable(example_server_flatbuffers src/example_server_flatbuffers.cpp ${flatbuffer_sources})
 add_dependencies(example_server_flatbuffers flatbuffers_generated_schemas)

diff --git a/cpp/examples/conanfile.py b/cpp/examples/conanfile.py
@@ -11,8 +11,8 @@ class FoxgloveWebSocketExamplesConan(ConanFile):
 
     def requirements(self):
         self.requires("flatbuffers/23.5.26")
+        self.requires("foxglove-schemas-protobuf/0.1.0")
         self.requires("foxglove-websocket/1.1.0")
-        self.requires("protobuf/3.21.4")
         self.requires("zlib/1.2.13")
 
     def layout(self):

diff --git a/cpp/examples/proto/foxglove/ArrowPrimitive.proto b/cpp/examples/proto/foxglove/ArrowPrimitive.proto
diff --git a/cpp/examples/proto/foxglove/CameraCalibration.proto b/cpp/examples/proto/foxglove/CameraCalibration.proto
diff --git a/cpp/examples/proto/foxglove/CircleAnnotation.proto b/cpp/examples/proto/foxglove/CircleAnnotation.proto
diff --git a/cpp/examples/proto/foxglove/Color.proto b/cpp/examples/proto/foxglove/Color.proto
diff --git a/cpp/examples/proto/foxglove/CompressedImage.proto b/cpp/examples/proto/foxglove/CompressedImage.proto
diff --git a/cpp/examples/proto/foxglove/CubePrimitive.proto b/cpp/examples/proto/foxglove/CubePrimitive.proto
diff --git a/cpp/examples/proto/foxglove/CylinderPrimitive.proto b/cpp/examples/proto/foxglove/CylinderPrimitive.proto
diff --git a/cpp/examples/proto/foxglove/FrameTransform.proto b/cpp/examples/proto/foxglove/FrameTransform.proto
diff --git a/cpp/examples/proto/foxglove/GeoJSON.proto b/cpp/examples/proto/foxglove/GeoJSON.proto
diff --git a/cpp/examples/proto/foxglove/Grid.proto b/cpp/examples/proto/foxglove/Grid.proto
diff --git a/cpp/examples/proto/foxglove/ImageAnnotations.proto b/cpp/examples/proto/foxglove/ImageAnnotations.proto
diff --git a/cpp/examples/proto/foxglove/KeyValuePair.proto b/cpp/examples/proto/foxglove/KeyValuePair.proto