From 91e3ceeea99ee3974beb91232daf46302e00b01a Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 17 Jan 2022 23:57:21 +0300
Subject: [PATCH] Remove unbundled capnp support

---
 CMakeLists.txt                         |  1 -
 cmake/find/capnp.cmake                 | 42 --------------------------
 contrib/CMakeLists.txt                 |  5 +--
 contrib/capnproto-cmake/CMakeLists.txt |  9 ++++++
 src/CMakeLists.txt                     |  4 +--
 src/Formats/CMakeLists.txt             |  3 ++
 6 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 cmake/find/capnp.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a63b2c3f339..bddd4fe8bf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,7 +491,6 @@ include (cmake/find/ltdl.cmake) # for odbc
 include (cmake/find/krb5.cmake)
 include (cmake/find/libgsasl.cmake)
 include (cmake/find/cyrus-sasl.cmake)
-include (cmake/find/capnp.cmake)
 include (cmake/find/llvm.cmake)
 include (cmake/find/h3.cmake)
 include (cmake/find/libxml2.cmake)
diff --git a/cmake/find/capnp.cmake b/cmake/find/capnp.cmake
deleted file mode 100644
index fa62c64105f..00000000000
--- a/cmake/find/capnp.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-option (ENABLE_CAPNP "Enable Cap'n Proto" ${ENABLE_LIBRARIES})
-
-if (NOT ENABLE_CAPNP)
-    if (USE_INTERNAL_CAPNP_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal capnproto library with ENABLE_CAPNP=OFF")
-    endif()
-    return()
-endif()
-
-option (USE_INTERNAL_CAPNP_LIBRARY "Set to FALSE to use system capnproto library instead of bundled" ON)
-
-if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/capnproto/c++")
-    if(USE_INTERNAL_CAPNP_LIBRARY)
-        message(WARNING "submodule contrib/capnproto is missing. to fix try run: \n git submodule update --init")
-        message(${RECONFIGURE_MESSAGE_LEVEL} "cannot find internal capnproto")
-        set(USE_INTERNAL_CAPNP_LIBRARY 0)
-    endif()
-    set(MISSING_INTERNAL_CAPNP_LIBRARY 1)
-endif()
-
-# FIXME: refactor to use `add_library(… IMPORTED)` if possible.
-if (NOT USE_INTERNAL_CAPNP_LIBRARY)
-    find_library (KJ kj)
-    find_library (CAPNP capnp)
-    find_library (CAPNPC capnpc)
-
-    if(KJ AND CAPNP AND CAPNPC)
-        set (CAPNP_LIBRARIES ${CAPNPC} ${CAPNP} ${KJ})
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system capnproto")
-    endif()
-endif()
-
-if (CAPNP_LIBRARIES)
-    set (USE_CAPNP 1)
-elseif(NOT MISSING_INTERNAL_CAPNP_LIBRARY)
-    set (CAPNP_LIBRARIES capnpc)
-    set (USE_CAPNP 1)
-    set (USE_INTERNAL_CAPNP_LIBRARY 1)
-endif ()
-
-message (STATUS "Using capnp=${USE_CAPNP}: ${CAPNP_LIBRARIES}")
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index e328e34ca5a..51bef7d5303 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -38,10 +38,7 @@ add_subdirectory (murmurhash)
 add_subdirectory (replxx-cmake)
 add_subdirectory (unixodbc-cmake)
 add_subdirectory (nanodbc-cmake)
-
-if (USE_INTERNAL_CAPNP_LIBRARY AND NOT MISSING_INTERNAL_CAPNP_LIBRARY)
-    add_subdirectory(capnproto-cmake)
-endif ()
+add_subdirectory (capnproto-cmake)
 
 if (USE_YAML_CPP)
     add_subdirectory (yaml-cpp-cmake)
diff --git a/contrib/capnproto-cmake/CMakeLists.txt b/contrib/capnproto-cmake/CMakeLists.txt
index 05446355535..7d34a4002af 100644
--- a/contrib/capnproto-cmake/CMakeLists.txt
+++ b/contrib/capnproto-cmake/CMakeLists.txt
@@ -1,3 +1,10 @@
+option (ENABLE_CAPNP "Enable Cap'n Proto" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_CAPNP)
+    message(STATUS "Not using Cap'n Proto library")
+    return()
+endif()
+
 set (CAPNPROTO_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/capnproto/c++/src")
 
 set (CMAKE_CXX_STANDARD 17)
@@ -85,3 +92,5 @@ endif ()
 target_compile_options(kj PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
 target_compile_options(capnp PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
 target_compile_options(capnpc PRIVATE ${SUPPRESS_WARNINGS} ${CAPNP_PRIVATE_CXX_FLAGS})
+
+add_library(ch_contrib::capnp ALIAS capnpc)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8342d08b82c..13040a5358c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -394,8 +394,8 @@ if (TARGET ch_contrib::icu)
     dbms_target_link_libraries (PRIVATE ch_contrib::icu)
 endif ()
 
-if (USE_CAPNP)
-    dbms_target_link_libraries (PRIVATE ${CAPNP_LIBRARIES})
+if (TARGET ch_contrib::capnp)
+    dbms_target_link_libraries (PRIVATE ch_contrib::capnp)
 endif ()
 
 if (TARGET ch_contrib::parquet)
diff --git a/src/Formats/CMakeLists.txt b/src/Formats/CMakeLists.txt
index f3a5a8a6025..6e6aa6d4553 100644
--- a/src/Formats/CMakeLists.txt
+++ b/src/Formats/CMakeLists.txt
@@ -15,4 +15,7 @@ endif()
 if (TARGET ch_contrib::msgpack)
     set(USE_MSGPACK 1)
 endif()
+if (TARGET ch_contrib::capnp)
+    set(USE_CAPNP 1)
+endif()
 configure_file(config_formats.h.in ${ConfigIncludePath}/config_formats.h)