From 5e853cff80c49bd0b2f893b140e7d381125b7275 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 26 Jun 2016 07:17:49 +0300 Subject: [PATCH] Preparing to remove private submodule [#METR-21847]. --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90e93c0f2b..bbb43ffcb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,9 +68,6 @@ ENDIF(TESTS) # Префикс для установки SET(CMAKE_INSTALL_PREFIX /usr) -# Директория для файлов, специфичных для Яндекса -SET(CLICKHOUSE_PRIVATE_DIR ${ClickHouse_SOURCE_DIR}/private/) - include_directories (${ClickHouse_SOURCE_DIR}/contrib/libcityhash/include/) include_directories (${ClickHouse_SOURCE_DIR}/contrib/liblz4/include/) include_directories (${ClickHouse_SOURCE_DIR}/contrib/libdivide/) @@ -120,8 +117,14 @@ include_directories (/usr/local/include/) link_directories (/usr/local/lib) +# Directory for Yandex specific files +SET(CLICKHOUSE_PRIVATE_DIR ${ClickHouse_SOURCE_DIR}/private/) + add_subdirectory (contrib) add_subdirectory (libs) add_subdirectory (utils) add_subdirectory (dbms) -add_subdirectory (private) + +IF (EXISTS ${CLICKHOUSE_PRIVATE_DIR}) + add_subdirectory (private) +ENDIF()