Make DBMS dependent on the protobuf library.

CMakeLists.txt

@@ -232,6 +232,7 @@ include (cmake/find_llvm.cmake)
 include (cmake/find_cpuid.cmake)
 include (cmake/find_libgsasl.cmake)
 include (cmake/find_libxml2.cmake)
+include (cmake/find_protobuf.cmake)
 include (cmake/find_hdfs3.cmake)
 include (cmake/find_consistent-hashing.cmake)
 include (cmake/find_base64.cmake)

contrib/CMakeLists.txt

@@ -207,14 +207,14 @@ if (USE_INTERNAL_LIBXML2_LIBRARY)
     add_subdirectory(libxml2-cmake)
 endif ()
 
+if (USE_INTERNAL_PROTOBUF_LIBRARY)
+    set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
+    set(protobuf_BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
+    set(protobuf_WITH_ZLIB 0 CACHE INTERNAL "" FORCE) # actually will use zlib, but skip find
+    add_subdirectory(protobuf/cmake)
+endif ()
+
 if (USE_INTERNAL_HDFS3_LIBRARY)
-    include(${ClickHouse_SOURCE_DIR}/cmake/find_protobuf.cmake)
-    if (USE_INTERNAL_PROTOBUF_LIBRARY)
-        set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
-        set(protobuf_BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
-        set(protobuf_WITH_ZLIB 0 CACHE INTERNAL "" FORCE) # actually will use zlib, but skip find
-        add_subdirectory(protobuf/cmake)
-    endif ()
     add_subdirectory(libhdfs3-cmake)
 endif ()
 

dbms/CMakeLists.txt

@@ -298,6 +298,9 @@ target_link_libraries(dbms PRIVATE ${OPENSSL_CRYPTO_LIBRARY} Threads::Threads)
 target_include_directories (dbms SYSTEM BEFORE PRIVATE ${DIVIDE_INCLUDE_DIR})
 target_include_directories (dbms SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
 
+target_link_libraries (dbms PRIVATE ${Protobuf_LIBRARY})
+target_include_directories (dbms SYSTEM BEFORE PRIVATE ${Protobuf_INCLUDE_DIR})
+
 if (USE_HDFS)
     target_link_libraries (clickhouse_common_io PRIVATE ${HDFS3_LIBRARY})
     target_include_directories (clickhouse_common_io SYSTEM BEFORE PRIVATE ${HDFS3_INCLUDE_DIR})