Merge branch 'gsk/protoc-plugin' of github.com:171930433/yalantinglib…

…s into gsk/protoc-plugin
171930433 · Mar 27, 2024 · 52889f9 · 52889f9
2 parents 29e9184 + 877a071
commit 52889f9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 48 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,9 +13,9 @@ project(yaLanTingLibs
 
 
 # set(SYSROOT_DIR /opt/zhito/sysroot)
-# set(CMAKE_PREFIX_PATH "/home/gsk/pro/CyberRT/install")
 if(NOT CMAKE_PREFIX_PATH)
-  set(CMAKE_PREFIX_PATH "/home/gsk/pro/ubuntu2204_docker/install")
+  set(CMAKE_PREFIX_PATH "/home/gsk/pro/CyberRT/install")
+  # set(CMAKE_PREFIX_PATH "/home/gsk/pro/ubuntu2204_docker/install")
 endif()
 
 find_package(protobuf REQUIRED)

diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
@@ -10,13 +10,7 @@ include(${struct_pb_plugin_DIRS}/cmake/struct_pb.cmake)
 find_package(PCL REQUIRED COMPONENTS common io)
 find_package(OpenCV REQUIRED COMPONENTS core)
 
-
 file(GLOB_RECURSE PROTO_FILES "*.proto")
-# set(PROTO_FILES 
-#    "/home/gsk/pro/yalantinglibs/src/example/base.proto"
-#    "/home/gsk/pro/yalantinglibs/src/example/message/zframe.proto" 
-#    "/home/gsk/pro/yalantinglibs/src/example/message/imu.proto" )
-
 
 protobuf_generate_modified(
   PROTO_PATH_FROM_CMAKE_SOURCE

diff --git a/src/example/message/CMakeLists.txt b/src/example/message/CMakeLists.txt