1 files changed, 87 insertions, 50 deletions
diff --git a/dep/protobuf/CMakeLists.txt b/dep/protobuf/CMakeLists.txt
index cce1181568a..2bd3a01f1f0 100644
--- a/dep/protobuf/CMakeLists.txt
+++ b/dep/protobuf/CMakeLists.txt
@@ -8,61 +8,98 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-set(protobuf_STAT_SRCS
-  src/google/protobuf/compiler/importer.cc
-  src/google/protobuf/compiler/parser.cc
-  src/google/protobuf/descriptor.cc
-  src/google/protobuf/descriptor.pb.cc
-  src/google/protobuf/descriptor_database.cc
-  src/google/protobuf/dynamic_message.cc
-  src/google/protobuf/extension_set.cc
-  src/google/protobuf/extension_set_heavy.cc
-  src/google/protobuf/generated_message_reflection.cc
-  src/google/protobuf/generated_message_util.cc
-  src/google/protobuf/io/coded_stream.cc
-  src/google/protobuf/io/gzip_stream.cc
-  src/google/protobuf/io/printer.cc
-  src/google/protobuf/io/strtod.cc
-  src/google/protobuf/io/tokenizer.cc
-  src/google/protobuf/io/zero_copy_stream.cc
-  src/google/protobuf/io/zero_copy_stream_impl.cc
-  src/google/protobuf/io/zero_copy_stream_impl_lite.cc
-  src/google/protobuf/message.cc
-  src/google/protobuf/message_lite.cc
-  src/google/protobuf/reflection_ops.cc
-  src/google/protobuf/repeated_field.cc
-  src/google/protobuf/service.cc
-  src/google/protobuf/stubs/common.cc
-  src/google/protobuf/stubs/once.cc
-  src/google/protobuf/stubs/stringprintf.cc
-  src/google/protobuf/stubs/structurally_valid.cc
-  src/google/protobuf/stubs/strutil.cc
-  src/google/protobuf/stubs/substitute.cc
-  src/google/protobuf/text_format.cc
-  src/google/protobuf/unknown_field_set.cc
-  src/google/protobuf/wire_format.cc
-  src/google/protobuf/wire_format_lite.cc
-)
+add_library(protobuf)
 
-if (MSVC)
-  set(protobuf_STAT_SRCS
-    ${protobuf_STAT_SRCS}
-    src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
-  )
-else()
-  set(protobuf_STAT_SRCS
-    ${protobuf_STAT_SRCS}
+target_sources(protobuf
+  PRIVATE
+    src/google/protobuf/compiler/importer.cc
+    src/google/protobuf/compiler/parser.cc
+    src/google/protobuf/descriptor.cc
+    src/google/protobuf/descriptor.pb.cc
+    src/google/protobuf/descriptor_database.cc
+    src/google/protobuf/dynamic_message.cc
+    src/google/protobuf/extension_set.cc
+    src/google/protobuf/extension_set_heavy.cc
+    src/google/protobuf/generated_message_reflection.cc
+    src/google/protobuf/generated_message_util.cc
+    src/google/protobuf/io/coded_stream.cc
+    src/google/protobuf/io/gzip_stream.cc
+    src/google/protobuf/io/printer.cc
+    src/google/protobuf/io/strtod.cc
+    src/google/protobuf/io/tokenizer.cc
+    src/google/protobuf/io/zero_copy_stream.cc
+    src/google/protobuf/io/zero_copy_stream_impl.cc
+    src/google/protobuf/io/zero_copy_stream_impl_lite.cc
+    src/google/protobuf/message.cc
+    src/google/protobuf/message_lite.cc
+    src/google/protobuf/reflection_ops.cc
+    src/google/protobuf/repeated_field.cc
+    src/google/protobuf/service.cc
     src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
-  )
-endif()
-
-add_library(protobuf ${protobuf_STAT_SRCS})
+    src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
+    src/google/protobuf/stubs/common.cc
+    src/google/protobuf/stubs/once.cc
+    src/google/protobuf/stubs/stringprintf.cc
+    src/google/protobuf/stubs/structurally_valid.cc
+    src/google/protobuf/stubs/strutil.cc
+    src/google/protobuf/stubs/substitute.cc
+    src/google/protobuf/text_format.cc
+    src/google/protobuf/unknown_field_set.cc
+    src/google/protobuf/wire_format.cc
+    src/google/protobuf/wire_format_lite.cc)
 
-target_include_directories(protobuf
+target_sources(protobuf
   PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    FILE_SET HEADERS
+    BASE_DIRS src
+    FILES
+      src/google/protobuf/compiler/importer.h
+      src/google/protobuf/compiler/parser.h
+      src/google/protobuf/descriptor_database.h
+      src/google/protobuf/descriptor.h
+      src/google/protobuf/descriptor.pb.h
+      src/google/protobuf/dynamic_message.h
+      src/google/protobuf/extension_set.h
+      src/google/protobuf/generated_enum_reflection.h
+      src/google/protobuf/generated_message_reflection.h
+      src/google/protobuf/generated_message_util.h
+      src/google/protobuf/io/coded_stream.h
+      src/google/protobuf/io/coded_stream_inl.h
+      src/google/protobuf/io/gzip_stream.h
+      src/google/protobuf/io/printer.h
+      src/google/protobuf/io/strtod.h
+      src/google/protobuf/io/tokenizer.h
+      src/google/protobuf/io/zero_copy_stream.h
+      src/google/protobuf/io/zero_copy_stream_impl.h
+      src/google/protobuf/io/zero_copy_stream_impl_lite.h
+      src/google/protobuf/message.h
+      src/google/protobuf/message_lite.h
+      src/google/protobuf/reflection_ops.h
+      src/google/protobuf/repeated_field.h
+      src/google/protobuf/service.h
+      src/google/protobuf/stubs/atomicops.h
+      src/google/protobuf/stubs/common.h
+      src/google/protobuf/stubs/hash.h
+      src/google/protobuf/stubs/map_util.h
+      src/google/protobuf/stubs/once.h
+      src/google/protobuf/stubs/platform_macros.h
+      src/google/protobuf/stubs/stl_util.h
+      src/google/protobuf/stubs/stringprintf.h
+      src/google/protobuf/stubs/strutil.h
+      src/google/protobuf/stubs/substitute.h
+      src/google/protobuf/stubs/template_util.h
+      src/google/protobuf/stubs/type_traits.h
+      src/google/protobuf/text_format.h
+      src/google/protobuf/unknown_field_set.h
+      src/google/protobuf/wire_format.h
+      src/google/protobuf/wire_format_lite.h
+      src/google/protobuf/wire_format_lite_inl.h
   PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/tc_custom)
+    FILE_SET protobuf_private_headers
+    TYPE HEADERS
+    BASE_DIRS tc_custom
+    FILES
+      tc_custom/config.h)
 
 target_link_libraries(protobuf
   PRIVATE