Merge branch 'gsk/compile_in_1804_gcc9' into gsk/compile_in_2204

171930433 · Mar 12, 2024 · 7e15a7a · 7e15a7a
2 parents 80ae9e2 + 396a805
commit 7e15a7a
Show file tree

Hide file tree

Showing 66 changed files with 56 additions and 212 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,23 @@
 cmake_minimum_required(VERSION 3.10)
+
+set(CMAKE_C_COMPILER gcc-9)
+set(CMAKE_CXX_COMPILER g++-9)
+set(CMAKE_CXX_STANDARD 17)
+
 project(yaLanTingLibs
         VERSION 0.2.9
         DESCRIPTION "yaLanTingLibs"
         HOMEPAGE_URL "https://github.com/alibaba/yalantinglibs"
         LANGUAGES CXX
         )
 
+find_package(Protobuf REQUIRED)
+
+# 将插件目录添加到环境变量
+execute_process(COMMAND export PATH=$PATH:${CMAKE_BINARY_DIR}/output/bin/)
+
+
+
 # load pack finder
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Find/)
 
@@ -31,8 +43,5 @@ if(CMAKE_PROJECT_NAME STREQUAL "yaLanTingLibs") # if ylt is top-level project
 endif()
 
 
-# set(CMAKE_C_COMPILER gcc-9)
-# set(CMAKE_CXX_COMPILER g++-9)
-list(APPEND CMAKE_PREFIX_PATH "/home/gsk/pro/CyberRT/install/")
-
-add_subdirectory(src/struct_pb/protoc-plugin)
+# add_subdirectory(src/struct_pb/protoc-plugin)
+add_subdirectory(src/example)
diff --git a/...t_pb/protoc-plugin/example/CMakeLists.txt → src/example/CMakeLists.txt b/...t_pb/protoc-plugin/example/CMakeLists.txt → src/example/CMakeLists.txt
@@ -4,7 +4,9 @@ add_compile_options(-Wno-attributes)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/examples)
 
-include(../cmake/struct_pb.cmake)
+
+set(protobuf_generate_PLUGIN "protoc-gen-struct_pb")
+include(cmake/struct_pb.cmake)
 
 cmake_policy(SET CMP0075 NEW)
 find_package(PCL REQUIRED COMPONENTS common io)
@@ -27,24 +29,8 @@ if (Protobuf_FOUND)
     pointcloud.proto
     image.proto
     )
-    add_executable(struct_pb_tutorial tutorial.cpp zpointcloud.cpp zimage.cpp     
-      ${PROTO_SRCS}
-      ${PROTO_HDRS})
-      target_link_libraries(struct_pb_tutorial protobuf::libprotobuf 
-        pcl_common pcl_io # pcl
-        opencv_imgcodecs opencv_core  # opencv
-      )
-
-
 
-    target_include_directories(struct_pb_tutorial PUBLIC 
-      ${CMAKE_CURRENT_BINARY_DIR}
-      ${CMAKE_CURRENT_LIST_DIR}
-      ${PCL_INCLUDE_DIRS}
-      ${OPENCV_INCLUDE_DIRS}
-      )
-
-    target_protos_struct_pb(struct_pb_tutorial PRIVATE 
+    protobuf_generate_struct_pb(PROTO_STRUCT_SRCS PROTO_STRUCT_HDRS
     # addressbook.proto  
     base.proto
     imu.proto
@@ -55,4 +41,22 @@ if (Protobuf_FOUND)
     # pointcloud.proto
     OPTION "namespace=inner_struct,converter_namespace=converter")
 
+
+    add_executable(struct_pb_tutorial tutorial.cpp           
+      ${PROTO_SRCS}
+      ${PROTO_HDRS}
+      ${PROTO_STRUCT_SRCS}
+      ${PROTO_STRUCT_HDRS}
+    )
+
+    target_link_libraries(struct_pb_tutorial protobuf::libprotobuf pcl_common)
+
+    target_include_directories(struct_pb_tutorial PUBLIC 
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${CMAKE_CURRENT_LIST_DIR}
+      ${PCL_INCLUDE_DIRS}
+    )
+
+
+
 endif()
diff --git a/...b/protoc-plugin/example/addressbook.proto → src/example/addressbook.proto b/...b/protoc-plugin/example/addressbook.proto → src/example/addressbook.proto
diff --git a/...truct_pb/protoc-plugin/example/base.proto → src/example/base.proto b/...truct_pb/protoc-plugin/example/base.proto → src/example/base.proto
@@ -3,6 +3,9 @@ package inner_class;
 
 import "proto_to_struct.proto";
 
+// import "google/protobuf/descriptor.proto";
+
+
 option(write_eigen_helper) = true;
 
 enum  ZFrameType{

diff --git a/...uct_pb/protoc-plugin/example/chasis.proto → src/example/chasis.proto b/...uct_pb/protoc-plugin/example/chasis.proto → src/example/chasis.proto
diff --git a/...ct_pb/protoc-plugin/cmake/struct_pb.cmake → src/example/cmake/struct_pb.cmake b/...ct_pb/protoc-plugin/cmake/struct_pb.cmake → src/example/cmake/struct_pb.cmake
@@ -36,6 +36,8 @@ function(protobuf_generate_modified)
         set(_opt "${opt},dllexport_decl=${protobuf_generate_EXPORT_MACRO}")
     endif()
     set(_opt "${_opt}:")
+
+
     if(protobuf_generate_PLUGIN)
         set(_plugin "--plugin=${protobuf_generate_PLUGIN}")
     endif()
@@ -172,7 +174,9 @@ function(protobuf_generate_struct_pb SRCS HDRS)
     set(_outvar)
     protobuf_generate_modified(${_append_arg} ${_descriptors}
             LANGUAGE struct_pb EXPORT_MACRO ${protobuf_generate_struct_pb_EXPORT_MACRO}
-            PLUGIN $<TARGET_FILE:protoc-gen-struct_pb>
+            # PLUGIN $<TARGET_FILE:protoc-gen-struct_pb>
+            # PLUGIN "/home/gsk/pro/yalantinglibs/build/output/bin/protoc-gen-struct_pb"
+            PLUGIN "struct_pb"
             OUT_VAR _outvar ${_import_arg} PROTOS ${_proto_files}
             PROTOC_OPTION ${_opt}
             )
@@ -224,7 +228,9 @@ function(target_protos_struct_pb target)
     protobuf_generate_modified(
             TARGET ${target}
             LANGUAGE struct_pb EXPORT_MACRO ${target_protos_struct_pb_EXPORT_MACRO}
-            PLUGIN $<TARGET_FILE:protoc-gen-struct_pb>
+            # PLUGIN $<TARGET_FILE:protoc-gen-struct_pb>
+            # PLUGIN "/home/gsk/pro/yalantinglibs/build/output/bin/protoc-gen-struct_pb"
+            PLUGIN "struct_pb"
             ${_import_arg} PROTOS ${_proto_files}
             PROTOC_OPTION ${_opt}
     )

diff --git a/...otoc-plugin/example/frozen/CMakeLists.txt → src/example/frozen/CMakeLists.txt b/...otoc-plugin/example/frozen/CMakeLists.txt → src/example/frozen/CMakeLists.txt
diff --git a/.../protoc-plugin/example/frozen/algorithm.h → src/example/frozen/algorithm.h b/.../protoc-plugin/example/frozen/algorithm.h → src/example/frozen/algorithm.h
diff --git a/...c-plugin/example/frozen/bits/algorithms.h → src/example/frozen/bits/algorithms.h b/...c-plugin/example/frozen/bits/algorithms.h → src/example/frozen/bits/algorithms.h
diff --git a/...-plugin/example/frozen/bits/basic_types.h → src/example/frozen/bits/basic_types.h b/...-plugin/example/frozen/bits/basic_types.h → src/example/frozen/bits/basic_types.h
diff --git a/...in/example/frozen/bits/constexpr_assert.h → src/example/frozen/bits/constexpr_assert.h b/...in/example/frozen/bits/constexpr_assert.h → src/example/frozen/bits/constexpr_assert.h
diff --git a/...otoc-plugin/example/frozen/bits/defines.h → src/example/frozen/bits/defines.h b/...otoc-plugin/example/frozen/bits/defines.h → src/example/frozen/bits/defines.h
diff --git a/.../protoc-plugin/example/frozen/bits/elsa.h → src/example/frozen/bits/elsa.h b/.../protoc-plugin/example/frozen/bits/elsa.h → src/example/frozen/bits/elsa.h
diff --git a/...toc-plugin/example/frozen/bits/elsa_std.h → src/example/frozen/bits/elsa_std.h b/...toc-plugin/example/frozen/bits/elsa_std.h → src/example/frozen/bits/elsa_std.h
diff --git a/...c-plugin/example/frozen/bits/exceptions.h → src/example/frozen/bits/exceptions.h b/...c-plugin/example/frozen/bits/exceptions.h → src/example/frozen/bits/exceptions.h
diff --git a/...-plugin/example/frozen/bits/hash_string.h → src/example/frozen/bits/hash_string.h b/...-plugin/example/frozen/bits/hash_string.h → src/example/frozen/bits/hash_string.h
diff --git a/...b/protoc-plugin/example/frozen/bits/pmh.h → src/example/frozen/bits/pmh.h b/...b/protoc-plugin/example/frozen/bits/pmh.h → src/example/frozen/bits/pmh.h
diff --git a/...otoc-plugin/example/frozen/bits/version.h → src/example/frozen/bits/version.h b/...otoc-plugin/example/frozen/bits/version.h → src/example/frozen/bits/version.h
diff --git a/...uct_pb/protoc-plugin/example/frozen/map.h → src/example/frozen/map.h b/...uct_pb/protoc-plugin/example/frozen/map.h → src/example/frozen/map.h
diff --git a/..._pb/protoc-plugin/example/frozen/random.h → src/example/frozen/random.h b/..._pb/protoc-plugin/example/frozen/random.h → src/example/frozen/random.h
diff --git a/...uct_pb/protoc-plugin/example/frozen/set.h → src/example/frozen/set.h b/...uct_pb/protoc-plugin/example/frozen/set.h → src/example/frozen/set.h
diff --git a/..._pb/protoc-plugin/example/frozen/string.h → src/example/frozen/string.h b/..._pb/protoc-plugin/example/frozen/string.h → src/example/frozen/string.h
diff --git a/...toc-plugin/example/frozen/unordered_map.h → src/example/frozen/unordered_map.h b/...toc-plugin/example/frozen/unordered_map.h → src/example/frozen/unordered_map.h
diff --git a/...toc-plugin/example/frozen/unordered_set.h → src/example/frozen/unordered_set.h b/...toc-plugin/example/frozen/unordered_set.h → src/example/frozen/unordered_set.h
diff --git a/...truct_pb/protoc-plugin/example/gnss.proto → src/example/gnss.proto b/...truct_pb/protoc-plugin/example/gnss.proto → src/example/gnss.proto
diff --git a/..._pb/protoc-plugin/example/iguana/define.h → src/example/iguana/define.h b/..._pb/protoc-plugin/example/iguana/define.h → src/example/iguana/define.h
diff --git a/...c-plugin/example/iguana/detail/charconv.h → src/example/iguana/detail/charconv.h b/...c-plugin/example/iguana/detail/charconv.h → src/example/iguana/detail/charconv.h
diff --git a/...-plugin/example/iguana/detail/dragonbox.h → src/example/iguana/detail/dragonbox.h b/...-plugin/example/iguana/detail/dragonbox.h → src/example/iguana/detail/dragonbox.h
diff --git a/...xample/iguana/detail/dragonbox_to_chars.h → ...xample/iguana/detail/dragonbox_to_chars.h b/...xample/iguana/detail/dragonbox_to_chars.h → ...xample/iguana/detail/dragonbox_to_chars.h
diff --git a/...plugin/example/iguana/detail/fast_float.h → src/example/iguana/detail/fast_float.h b/...plugin/example/iguana/detail/fast_float.h → src/example/iguana/detail/fast_float.h
diff --git a/...toc-plugin/example/iguana/detail/itoa.hpp → src/example/iguana/detail/itoa.hpp b/...toc-plugin/example/iguana/detail/itoa.hpp → src/example/iguana/detail/itoa.hpp
diff --git a/...n/example/iguana/detail/string_stream.hpp → src/example/iguana/detail/string_stream.hpp b/...n/example/iguana/detail/string_stream.hpp → src/example/iguana/detail/string_stream.hpp
diff --git a/...c-plugin/example/iguana/detail/traits.hpp → src/example/iguana/detail/traits.hpp b/...c-plugin/example/iguana/detail/traits.hpp → src/example/iguana/detail/traits.hpp
diff --git a/...otoc-plugin/example/iguana/detail/utf.hpp → src/example/iguana/detail/utf.hpp b/...otoc-plugin/example/iguana/detail/utf.hpp → src/example/iguana/detail/utf.hpp
diff --git a/...plugin/example/iguana/enum_reflection.hpp → src/example/iguana/enum_reflection.hpp b/...plugin/example/iguana/enum_reflection.hpp → src/example/iguana/enum_reflection.hpp
diff --git a/...protoc-plugin/example/iguana/error_code.h → src/example/iguana/error_code.h b/...protoc-plugin/example/iguana/error_code.h → src/example/iguana/error_code.h
diff --git a/...toc-plugin/example/iguana/json_reader.hpp → src/example/iguana/json_reader.hpp b/...toc-plugin/example/iguana/json_reader.hpp → src/example/iguana/json_reader.hpp
diff --git a/...rotoc-plugin/example/iguana/json_util.hpp → src/example/iguana/json_util.hpp b/...rotoc-plugin/example/iguana/json_util.hpp → src/example/iguana/json_util.hpp
diff --git a/...toc-plugin/example/iguana/json_writer.hpp → src/example/iguana/json_writer.hpp b/...toc-plugin/example/iguana/json_writer.hpp → src/example/iguana/json_writer.hpp
diff --git a/...protoc-plugin/example/iguana/prettify.hpp → src/example/iguana/prettify.hpp b/...protoc-plugin/example/iguana/prettify.hpp → src/example/iguana/prettify.hpp
diff --git a/...otoc-plugin/example/iguana/reflection.hpp → src/example/iguana/reflection.hpp b/...otoc-plugin/example/iguana/reflection.hpp → src/example/iguana/reflection.hpp
diff --git a/..._pb/protoc-plugin/example/iguana/util.hpp → src/example/iguana/util.hpp b/..._pb/protoc-plugin/example/iguana/util.hpp → src/example/iguana/util.hpp
diff --git a/...pb/protoc-plugin/example/iguana/value.hpp → src/example/iguana/value.hpp b/...pb/protoc-plugin/example/iguana/value.hpp → src/example/iguana/value.hpp
diff --git a/...otoc-plugin/example/iguana/xml_reader.hpp → src/example/iguana/xml_reader.hpp b/...otoc-plugin/example/iguana/xml_reader.hpp → src/example/iguana/xml_reader.hpp
diff --git a/...protoc-plugin/example/iguana/xml_util.hpp → src/example/iguana/xml_util.hpp b/...protoc-plugin/example/iguana/xml_util.hpp → src/example/iguana/xml_util.hpp
diff --git a/...otoc-plugin/example/iguana/xml_writer.hpp → src/example/iguana/xml_writer.hpp b/...otoc-plugin/example/iguana/xml_writer.hpp → src/example/iguana/xml_writer.hpp
diff --git a/...toc-plugin/example/iguana/yaml_reader.hpp → src/example/iguana/yaml_reader.hpp b/...toc-plugin/example/iguana/yaml_reader.hpp → src/example/iguana/yaml_reader.hpp
diff --git a/...rotoc-plugin/example/iguana/yaml_util.hpp → src/example/iguana/yaml_util.hpp b/...rotoc-plugin/example/iguana/yaml_util.hpp → src/example/iguana/yaml_util.hpp
diff --git a/...toc-plugin/example/iguana/yaml_writer.hpp → src/example/iguana/yaml_writer.hpp b/...toc-plugin/example/iguana/yaml_writer.hpp → src/example/iguana/yaml_writer.hpp
diff --git a/...ruct_pb/protoc-plugin/example/image.proto → src/example/image.proto b/...ruct_pb/protoc-plugin/example/image.proto → src/example/image.proto
diff --git a/...struct_pb/protoc-plugin/example/imu.proto → src/example/imu.proto b/...struct_pb/protoc-plugin/example/imu.proto → src/example/imu.proto
diff --git a/...b/protoc-plugin/example/nlohmann/json.hpp → src/example/nlohmann/json.hpp b/...b/protoc-plugin/example/nlohmann/json.hpp → src/example/nlohmann/json.hpp
diff --git a/...otoc-plugin/example/nlohmann/json_fwd.hpp → src/example/nlohmann/json_fwd.hpp b/...otoc-plugin/example/nlohmann/json_fwd.hpp → src/example/nlohmann/json_fwd.hpp
diff --git a/...pb/protoc-plugin/example/perception.proto → src/example/perception.proto b/...pb/protoc-plugin/example/perception.proto → src/example/perception.proto
diff --git a/...pb/protoc-plugin/example/pointcloud.proto → src/example/pointcloud.proto b/...pb/protoc-plugin/example/pointcloud.proto → src/example/pointcloud.proto
diff --git a/...otoc-plugin/example/proto_to_struct.proto → src/example/proto_to_struct.proto b/...otoc-plugin/example/proto_to_struct.proto → src/example/proto_to_struct.proto
diff --git a/...ruct_pb/protoc-plugin/example/state.proto → src/example/state.proto b/...ruct_pb/protoc-plugin/example/state.proto → src/example/state.proto
diff --git a/...uct_pb/protoc-plugin/example/tutorial.cpp → src/example/tutorial.cpp b/...uct_pb/protoc-plugin/example/tutorial.cpp → src/example/tutorial.cpp
diff --git a/...pb/protoc-plugin/example/xyzit_points.hpp → src/example/xyzit_points.hpp b/...pb/protoc-plugin/example/xyzit_points.hpp → src/example/xyzit_points.hpp
diff --git a/...truct_pb/protoc-plugin/example/zimage.cpp → src/example/zimage.cpp b/...truct_pb/protoc-plugin/example/zimage.cpp → src/example/zimage.cpp
diff --git a/...truct_pb/protoc-plugin/example/zimage.hpp → src/example/zimage.hpp b/...truct_pb/protoc-plugin/example/zimage.hpp → src/example/zimage.hpp
diff --git a/..._pb/protoc-plugin/example/zpointcloud.cpp → src/example/zpointcloud.cpp b/..._pb/protoc-plugin/example/zpointcloud.cpp → src/example/zpointcloud.cpp
diff --git a/..._pb/protoc-plugin/example/zpointcloud.hpp → src/example/zpointcloud.hpp b/..._pb/protoc-plugin/example/zpointcloud.hpp → src/example/zpointcloud.hpp
diff --git a/src/struct_pb/protoc-plugin/CMakeLists.txt b/src/struct_pb/protoc-plugin/CMakeLists.txt
@@ -1,17 +1,23 @@
 cmake_minimum_required(VERSION 3.10)
-
-set(CMAKE_CXX_STANDARD 17)
+# set(CMAKE_C_COMPILER gcc-9)
+# set(CMAKE_CXX_COMPILER g++-9)
+# set(CMAKE_CXX_STANDARD 17)
 
 project(protoc-gen-struct_pb)
 
 
+# add_subdirectory(example)
 
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
 find_package(Protobuf QUIET)
 if (Protobuf_FOUND)
+
     file(GLOB SRCS "*.cpp" "*.cc" "*.h")
-    add_executable(protoc-gen-struct_pb ${SRCS})
+    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})
     target_link_libraries(protoc-gen-struct_pb PUBLIC protobuf::libprotoc protobuf::libprotobuf)
     install(
         TARGETS protoc-gen-struct_pb
@@ -25,5 +31,3 @@ else ()
             "see https://alibaba.github.io/yalantinglibs/en/struct_pb/struct_pb_generating_your_struct.html"
             )
 endif ()
-
-add_subdirectory(example)
diff --git a/src/struct_pb/protoc-plugin/proto_to_struct.pb.cc b/src/struct_pb/protoc-plugin/proto_to_struct.pb.cc
diff --git a/src/struct_pb/protoc-plugin/proto_to_struct.pb.h b/src/struct_pb/protoc-plugin/proto_to_struct.pb.h