Install well-known protobuf types

ClickHouse · Nov 15, 2023 · f9688ac · f9688ac
1 parent 2b554da
commit f9688ac
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/contrib/google-protobuf-cmake/CMakeLists.txt b/contrib/google-protobuf-cmake/CMakeLists.txt
@@ -320,9 +320,25 @@ endif ()
 
 include("${ClickHouse_SOURCE_DIR}/contrib/google-protobuf-cmake/protobuf_generate.cmake")
 
+# These files needs to be installed to make it possible that users can use well-known protobuf types
+set(google_proto_files
+  ${protobuf_source_dir}/src/google/protobuf/any.proto
+  ${protobuf_source_dir}/src/google/protobuf/api.proto
+  ${protobuf_source_dir}/src/google/protobuf/descriptor.proto
+  ${protobuf_source_dir}/src/google/protobuf/duration.proto
+  ${protobuf_source_dir}/src/google/protobuf/empty.proto
+  ${protobuf_source_dir}/src/google/protobuf/field_mask.proto
+  ${protobuf_source_dir}/src/google/protobuf/source_context.proto
+  ${protobuf_source_dir}/src/google/protobuf/struct.proto
+  ${protobuf_source_dir}/src/google/protobuf/timestamp.proto
+  ${protobuf_source_dir}/src/google/protobuf/type.proto
+  ${protobuf_source_dir}/src/google/protobuf/wrappers.proto
+)
+
 add_library(_protobuf INTERFACE)
 target_link_libraries(_protobuf INTERFACE _libprotobuf)
 target_include_directories(_protobuf INTERFACE "${Protobuf_INCLUDE_DIR}")
+set_target_properties(_protobuf PROPERTIES google_proto_files "${google_proto_files}")
 add_library(ch_contrib::protobuf ALIAS _protobuf)
 
 add_library(_protoc INTERFACE)

diff --git a/packages/clickhouse-common-static.yaml b/packages/clickhouse-common-static.yaml
@@ -44,6 +44,8 @@ contents:
   dst: /usr/bin/clickhouse-odbc-bridge
 - src: root/usr/share/bash-completion/completions
   dst: /usr/share/bash-completion/completions
+- src: root/usr/share/clickhouse
+  dst: /usr/share/clickhouse
 # docs
 - src: ../AUTHORS
   dst: /usr/share/doc/clickhouse-common-static/AUTHORS

diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
@@ -460,3 +460,11 @@ endif()
 if (ENABLE_FUZZING)
     add_compile_definitions(FUZZING_MODE=1)
 endif ()
+
+if (TARGET ch_contrib::protobuf)
+    get_property(google_proto_files TARGET ch_contrib::protobuf PROPERTY google_proto_files)
+    message(WARNING "PROTO FILES ${google_proto_files}")
+    foreach (proto_file IN LISTS google_proto_files)
+        install(FILES ${proto_file} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse/proto/google/protobuf)
+    endforeach()
+endif ()