均使用protobuf_generate_modified

171930433 · Mar 24, 2024 · 39c650f · 39c650f
1 parent d0c8ffa
commit 39c650f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ project(yaLanTingLibs
 
 # set(SYSROOT_DIR /opt/zhito/sysroot)
 # set(CMAKE_PREFIX_PATH "/home/gsk/pro/CyberRT/install")
-if(NOT ${CMAKE_PREFIX_PATH})
+if(NOT CMAKE_PREFIX_PATH)
   set(CMAKE_PREFIX_PATH "/home/gsk/pro/ubuntu2204_docker/install")
 endif()
 
@@ -25,5 +25,5 @@ add_subdirectory(src/protoc-plugin)
 option(BUILD_EXAMPLES OFF)
 
 if(BUILD_EXAMPLES)
-  add_subdirectory(src/example)
+add_subdirectory(src/example)
 endif()
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE PROTO_FILES "*.proto")
 #    "/home/gsk/pro/yalantinglibs/src/example/message/imu.proto" )
 
 
-protobuf_generate(
+protobuf_generate_modified(
   LANGUAGE cpp
   OUT_VAR PROTO_CLASS_SRCS
   IMPORT_DIRS ${CMAKE_SOURCE_DIR}
@@ -31,7 +31,7 @@ protobuf_generate(
 )
 
 
-protobuf_generate(
+protobuf_generate_modified(
   LANGUAGE python
   OUT_VAR PROTO_PYTHON_SRCS
   IMPORT_DIRS ${CMAKE_SOURCE_DIR}

diff --git a/src/protoc-plugin/CMakeLists.txt b/src/protoc-plugin/CMakeLists.txt
@@ -9,10 +9,20 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
 
 find_package(Protobuf REQUIRED)
 file(GLOB SRCS "*.cpp" "*.cc" "*.h")
-protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS proto_to_struct.proto)
+# protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS proto_to_struct.proto)
 
-add_executable(protoc-gen-struct_pb ${SRCS} ${PROTO_SRCS} ${PROTO_HDRS})
-target_include_directories(protoc-gen-struct_pb PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+include(cmake/struct_pb.cmake)
+protobuf_generate_modified(
+  LANGUAGE cpp
+  OUT_VAR PROTO_CLASS_SRCS
+  IMPORT_DIRS ${CMAKE_SOURCE_DIR}
+  PROTOS proto_to_struct.proto
+  PROTOC_OUT_DIR ${CMAKE_BINARY_DIR}
+)
+
+
+add_executable(protoc-gen-struct_pb ${SRCS} ${PROTO_CLASS_SRCS})
+target_include_directories(protoc-gen-struct_pb PUBLIC ${CMAKE_BINARY_DIR})
 target_link_libraries(protoc-gen-struct_pb PUBLIC protobuf::libprotoc protobuf::libprotobuf)
 install(
     TARGETS protoc-gen-struct_pb

diff --git a/src/protoc-plugin/Options.hpp b/src/protoc-plugin/Options.hpp
@@ -5,7 +5,7 @@
 #include "google/protobuf/descriptor.h"
 
 // added
-#include "proto_to_struct.pb.h"
+#include "src/protoc-plugin/proto_to_struct.pb.h"
 
 struct Options {
   Options(const google::protobuf::FileDescriptor* f) : f(f) {}