some changes

Author: Gazizonoki

cmake/common.cmake

@@ -201,8 +201,9 @@ function(_ydb_sdk_add_library Tgt)
 endfunction()
 
 function(_ydb_sdk_validate_public_headers)
-  file(GLOB_RECURSE allHeaders RELATIVE ${YDB_SDK_SOURCE_DIR}/include ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk)
+  file(GLOB_RECURSE allHeaders RELATIVE ${YDB_SDK_SOURCE_DIR}/include ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/*)
   file(STRINGS ${YDB_SDK_SOURCE_DIR}/cmake/public_headers.txt specialHeaders)
+  file(STRINGS ${YDB_SDK_SOURCE_DIR}/cmake/protos_public_headers.txt protosHeaders)
   if (NOT MSVC)
     list(REMOVE_ITEM specialHeaders library/cpp/deprecated/atomic/atomic_win.h)
   endif()
@@ -215,18 +216,38 @@ function(_ydb_sdk_validate_public_headers)
     )
   endforeach()
 
+  add_custom_target(make_validate_proto_headers
+    COMMAND ${CMAKE_COMMAND} -E
+    WORKING_DIRECTORY ${YDB_SDK_BINARY_DIR}
+  )
+  foreach(path ${protosHeaders})
+    get_filename_component(relPath ${path} DIRECTORY)
+    add_custom_command(OUTPUT ${YDB_SDK_BINARY_DIR}/__validate_headers_dir/include/${path}
+      COMMAND ${CMAKE_COMMAND} -E
+        copy "${YDB_SDK_BINARY_DIR}/${path}" "${YDB_SDK_BINARY_DIR}/__validate_headers_dir/include/${relPath}"
+    )
+  endforeach()
+
   list(REMOVE_ITEM allHeaders
     library/cpp/threading/future/core/future-inl.h
     library/cpp/threading/future/wait/wait-inl.h
     library/cpp/yt/misc/guid-inl.h
   )
+
+  set(targetHeaders ${allHeaders})
+  list(APPEND targetHeaders ${protosHeaders})
+  list(TRANSFORM targetHeaders PREPEND "${YDB_SDK_BINARY_DIR}/__validate_headers_dir/include/")
+
   list(TRANSFORM allHeaders PREPEND "#include <")
   list(TRANSFORM allHeaders APPEND ">")
   list(JOIN allHeaders "\n" fileContent)
 
   file(WRITE ${YDB_SDK_BINARY_DIR}/__validate_headers_dir/main.cpp ${fileContent})
 
-  add_library(validate_public_interface MODULE ${YDB_SDK_BINARY_DIR}/__validate_headers_dir/main.cpp)
+  add_library(validate_public_interface MODULE
+    ${YDB_SDK_BINARY_DIR}/__validate_headers_dir/main.cpp
+    ${targetHeaders}
+  )
   target_include_directories(validate_public_interface PUBLIC ${YDB_SDK_BINARY_DIR}/__validate_headers_dir/include)
 endfunction()
 

cmake/install.cmake

@@ -66,23 +66,10 @@ function(_ydb_sdk_install_headers ArgIncludeDir)
   )
 
   file(STRINGS ${YDB_SDK_SOURCE_DIR}/cmake/public_headers.txt PublicHeaders)
+  file(STRINGS ${YDB_SDK_SOURCE_DIR}/cmake/protos_public_headers.txt ProtosPublicHeaders)
   if (NOT MSVC)
     list(REMOVE_ITEM PublicHeaders library/cpp/deprecated/atomic/atomic_win.h)
   endif()
-  list(APPEND ProtosPublicHeaders
-    src/api/protos/ydb_federation_discovery.pb.h
-    src/api/protos/ydb_value.pb.h
-    src/api/protos/ydb_query.pb.h
-    src/api/protos/ydb_topic.pb.h
-    src/api/protos/ydb_table.pb.h
-    src/api/protos/ydb_query_stats.pb.h
-    src/api/protos/ydb_import.pb.h
-    src/api/protos/ydb_export.pb.h
-    src/api/protos/ydb_coordination.pb.h
-    src/api/protos/draft/ydb_replication.pb.h
-    src/library/operation_id/protos/operation_id.pb.h
-    src/library/yql/public/issue/protos/issue_severity.pb.h
-  )
   foreach(HeaderPath ${PublicHeaders})
     get_filename_component(RelInstallPath ${HeaderPath} DIRECTORY)
     _ydb_sdk_directory_install(FILES

cmake/protos_public_headers.txt

@@ -0,0 +1,24 @@
+src/api/grpc/draft/ydb_datastreams_v1.grpc.pb.h
+src/api/grpc/draft/ydb_datastreams_v1.pb.h
+src/api/grpc/ydb_topic_v1.grpc.pb.h
+src/api/grpc/ydb_topic_v1.pb.h
+src/api/protos/annotations/validation.pb.h
+src/api/protos/draft/datastreams.pb.h
+src/api/protos/ydb_common.pb.h
+src/api/protos/ydb_federation_discovery.pb.h
+src/api/protos/ydb_operation.pb.h
+src/api/protos/ydb_value.pb.h
+src/api/protos/ydb_query.pb.h
+src/api/protos/ydb_topic.pb.h
+src/api/protos/ydb_table.pb.h
+src/api/protos/ydb_scheme.pb.h
+src/api/protos/ydb_query_stats.pb.h
+src/api/protos/ydb_import.pb.h
+src/api/protos/ydb_formats.pb.h
+src/api/protos/ydb_issue_message.pb.h
+src/api/protos/ydb_export.pb.h
+src/api/protos/ydb_coordination.pb.h
+src/api/protos/ydb_status_codes.pb.h
+src/api/protos/draft/ydb_replication.pb.h
+src/library/operation_id/protos/operation_id.pb.h
+src/library/yql/public/issue/protos/issue_severity.pb.h

cmake/public_headers.txt

@@ -101,6 +101,7 @@ util/generic/array_size.h
 util/generic/array_ref.h
 util/generic/bitops.h
 util/generic/bt_exception.h
+util/generic/buffer.h
 util/generic/cast.h
 util/generic/deque.h
 util/generic/explicit_type.h