From 7bcf8ec3440829304945c3ac85dc623bc20cd494 Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 27 Mar 2019 18:05:05 +0300 Subject: [PATCH] Fix install in shared mode --- dbms/programs/CMakeLists.txt | 1 + dbms/programs/clickhouse-split-helper | 6 ++++++ debian/control | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dbms/programs/CMakeLists.txt b/dbms/programs/CMakeLists.txt index 6015f1c1b7..b692865280 100644 --- a/dbms/programs/CMakeLists.txt +++ b/dbms/programs/CMakeLists.txt @@ -93,6 +93,7 @@ if (CLICKHOUSE_ONE_SHARED) target_link_libraries(clickhouse-lib ${CLICKHOUSE_SERVER_LINK} ${CLICKHOUSE_CLIENT_LINK} ${CLICKHOUSE_LOCAL_LINK} ${CLICKHOUSE_BENCHMARK_LINK} ${CLICKHOUSE_PERFORMANCE_TEST_LINK} ${CLICKHOUSE_COPIER_LINK} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_LINK} ${CLICKHOUSE_COMPRESSOR_LINK} ${CLICKHOUSE_FORMAT_LINK} ${CLICKHOUSE_OBFUSCATOR_LINK} ${CLICKHOUSE_COMPILER_LINK} ${CLICKHOUSE_ODBC_BRIDGE_LINK}) target_include_directories(clickhouse-lib ${CLICKHOUSE_SERVER_INCLUDE} ${CLICKHOUSE_CLIENT_INCLUDE} ${CLICKHOUSE_LOCAL_INCLUDE} ${CLICKHOUSE_BENCHMARK_INCLUDE} ${CLICKHOUSE_PERFORMANCE_TEST_INCLUDE} ${CLICKHOUSE_COPIER_INCLUDE} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_INCLUDE} ${CLICKHOUSE_COMPRESSOR_INCLUDE} ${CLICKHOUSE_FORMAT_INCLUDE} ${CLICKHOUSE_OBFUSCATOR_INCLUDE} ${CLICKHOUSE_COMPILER_INCLUDE} ${CLICKHOUSE_ODBC_BRIDGE_INCLUDE}) set_target_properties(clickhouse-lib PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR} VERSION ${VERSION_SO} OUTPUT_NAME clickhouse DEBUG_POSTFIX "") + install (TARGETS clickhouse-lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT clickhouse) endif() if (CLICKHOUSE_SPLIT_BINARY) diff --git a/dbms/programs/clickhouse-split-helper b/dbms/programs/clickhouse-split-helper index 2495160e02..14a86f7609 100755 --- a/dbms/programs/clickhouse-split-helper +++ b/dbms/programs/clickhouse-split-helper @@ -1,5 +1,11 @@ #!/bin/sh +# Helper for split build mode. +# Allows to run commands like +# clickhouse client +# clickhouse server +# ... + set -e CMD=$1 shift diff --git a/debian/control b/debian/control index 493ed628f9..78ea906973 100644 --- a/debian/control +++ b/debian/control @@ -28,8 +28,8 @@ Package: clickhouse-common-static Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, tzdata Suggests: clickhouse-common-static-dbg -Replaces: clickhouse-server-base -Provides: clickhouse-server-base +Replaces: clickhouse-common, clickhouse-server-base +Provides: clickhouse-common, clickhouse-server-base Description: Common files for ClickHouse Yandex ClickHouse is a column-oriented database management system that allows generating analytical data reports in real time. -- GitLab