diff --git a/CMakeLists.txt b/CMakeLists.txt index 325147204b5..599d9dac278 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,13 +264,6 @@ if (USE_INCLUDE_WHAT_YOU_USE) endif() endif () -# when installing to /usr - place configs to /etc but for /usr/local place to /usr/local/etc -if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") - set (TIFLASH_ETC_DIR "/etc") -else () - set (TIFLASH_ETC_DIR "${CMAKE_INSTALL_PREFIX}/etc") -endif () - option (UNBUNDLED "Try find all libraries in system (if fail - use bundled from contrib/)" OFF) if (UNBUNDLED) set(NOT_UNBUNDLED 0) diff --git a/dbms/src/Server/CMakeLists.txt b/dbms/src/Server/CMakeLists.txt index eca19150f81..2877d6cba00 100644 --- a/dbms/src/Server/CMakeLists.txt +++ b/dbms/src/Server/CMakeLists.txt @@ -43,7 +43,6 @@ target_link_libraries (clickhouse-extract-from-config-lib clickhouse_common_conf add_library (clickhouse-client-lib Client.cpp) target_link_libraries (clickhouse-client-lib clickhouse_functions clickhouse_aggregate_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_include_directories (clickhouse-client-lib PRIVATE ${READLINE_INCLUDE_DIR}) -install (FILES clickhouse-client.xml DESTINATION ${TIFLASH_ETC_DIR}/clickhouse-client COMPONENT clickhouse-client RENAME config.xml) add_library (clickhouse-benchmark-lib ${SPLIT_SHARED} Benchmark.cpp) target_link_libraries (clickhouse-benchmark-lib clickhouse-client-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) @@ -206,8 +205,3 @@ endif () set (GLIBC_MAX_REQUIRED 2.4) add_test(NAME GLIBC_required_version COMMAND bash -c "readelf -s ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server | grep '@GLIBC' | grep -oP 'GLIBC_[\\d\\.]+' | sort | uniq | sort -r | perl -lnE 'exit 1 if $_ gt q{GLIBC_${GLIBC_MAX_REQUIRED}}'") - -install ( - FILES config.xml users.xml - DESTINATION ${TIFLASH_ETC_DIR}/clickhouse-server - COMPONENT tiflash)