From 1520b6aa2aa5833637ea45fab55ce3e0b57caf60 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 29 Oct 2020 08:27:55 +0300
Subject: [PATCH] Take out odbc-bridge from clickhouse bundle

---
 programs/CMakeLists.txt                   |  3 ---
 programs/odbc-bridge/CMakeLists.txt       | 23 ++++++++++-------------
 programs/odbc-bridge/tests/CMakeLists.txt |  3 +--
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 3577ee3df31..3817bc62bcb 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -227,9 +227,6 @@ else ()
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-git-import DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-git-import)
     endif ()
-    if(ENABLE_CLICKHOUSE_ODBC_BRIDGE)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-odbc-bridge)
-    endif()
 
     install (TARGETS clickhouse RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
 
diff --git a/programs/odbc-bridge/CMakeLists.txt b/programs/odbc-bridge/CMakeLists.txt
index ae60bcd5f0b..043c0d5dd7d 100644
--- a/programs/odbc-bridge/CMakeLists.txt
+++ b/programs/odbc-bridge/CMakeLists.txt
@@ -10,17 +10,8 @@ set (CLICKHOUSE_ODBC_BRIDGE_SOURCES
     PingHandler.cpp
     SchemaAllowedHandler.cpp
     validateODBCConnectionString.cpp
+    odbc-bridge.cpp
 )
-set (CLICKHOUSE_ODBC_BRIDGE_LINK
-    PRIVATE
-        daemon
-        dbms
-        Poco::Data
-    PUBLIC
-        Poco::Data::ODBC
-)
-
-clickhouse_program_add_library(odbc-bridge)
 
 if (OS_LINUX)
     # clickhouse-odbc-bridge is always a separate binary.
@@ -28,10 +19,16 @@ if (OS_LINUX)
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic")
 endif ()
 
-add_executable(clickhouse-odbc-bridge odbc-bridge.cpp)
-set_target_properties(clickhouse-odbc-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+add_executable(clickhouse-odbc-bridge ${CLICKHOUSE_ODBC_BRIDGE_SOURCES})
 
-clickhouse_program_link_split_binary(odbc-bridge)
+target_link_libraries(clickhouse-odbc-bridge PRIVATE
+    daemon
+    clickhouse_common_io
+    Poco::Data
+    Poco::Data::ODBC
+)
+
+set_target_properties(clickhouse-odbc-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
 
 if (USE_GDB_ADD_INDEX)
     add_custom_command(TARGET clickhouse-odbc-bridge POST_BUILD COMMAND ${GDB_ADD_INDEX_EXE} ../clickhouse-odbc-bridge COMMENT "Adding .gdb-index to clickhouse-odbc-bridge" VERBATIM)
diff --git a/programs/odbc-bridge/tests/CMakeLists.txt b/programs/odbc-bridge/tests/CMakeLists.txt
index 60e7afab969..3e0af8c940f 100644
--- a/programs/odbc-bridge/tests/CMakeLists.txt
+++ b/programs/odbc-bridge/tests/CMakeLists.txt
@@ -1,3 +1,2 @@
-add_executable (validate-odbc-connection-string validate-odbc-connection-string.cpp)
-clickhouse_target_link_split_lib(validate-odbc-connection-string odbc-bridge)
+add_executable (validate-odbc-connection-string validate-odbc-connection-string.cpp ../validateODBCConnectionString.cpp)
 target_link_libraries (validate-odbc-connection-string PRIVATE clickhouse_common_io)