peranger/AimRT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: add external proto path for source directory (#99)

Browse Source 
Configure the build system to include the source directory in the proto path for all relevant targets, ensuring improved resolution of proto files during code generation.
This commit is contained in:
zhangyi1357 2024-11-13 13:48:48 +08:00 committed by GitHub
parent bb68f77f67
commit 7534ac360a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/ProtobufGenCode.cmake
View File

@ -21,6 +21,7 @@ function(add_protobuf_gencode_target_for_proto_path)
get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH) get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH)
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}") list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}")
endforeach() endforeach()
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${protobuf_SOURCE_DIR}/src")
list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS) list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS)
get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY) get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY)
@ -84,6 +85,7 @@ function(add_protobuf_gencode_target_for_one_proto_file)
get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH) get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH)
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}") list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}")
endforeach() endforeach()
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${protobuf_SOURCE_DIR}/src")
list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS) list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS)
get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY) get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY)

1
src/tools/protoc_plugin_cpp_gen_aimrt_cpp_rpc/ProtobufAimRTRpcGenCode.cmake
View File

@ -21,6 +21,7 @@ function(add_protobuf_aimrt_rpc_gencode_target_for_proto_files)
get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH) get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH)
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}") list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}")
endforeach() endforeach()
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${protobuf_SOURCE_DIR}/src")
list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS) list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS)
get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY) get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY)

1
src/tools/protoc_plugin_py_gen_aimrt_cpp_rpc/ProtobufAimRTRpcGenCode.cmake
View File

@ -21,6 +21,7 @@ function(add_protobuf_aimrt_rpc_gencode_target_for_proto_files)
get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH) get_target_property(DEP_PROTO_TARGET_PROTO_PATH ${CUR_DEP_PROTO_TARGET} PROTO_PATH)
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}") list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${DEP_PROTO_TARGET_PROTO_PATH}")
endforeach() endforeach()
list(APPEND PROTOC_EXTERNAL_PROTO_PATH_ARGS "--proto_path=${protobuf_SOURCE_DIR}/src")
list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS) list(REMOVE_DUPLICATES PROTOC_EXTERNAL_PROTO_PATH_ARGS)
get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY) get_property(PROTOC_NAMESPACE GLOBAL PROPERTY PROTOC_NAMESPACE_PROPERTY)