Skip to content

Commit 003cdbc

Browse files
committed
Introduce clickhouse_common_config_no_zookeeper_log
Otherwise incorrect zookeeper (w/o log) will be used in clickhouse server itself.
1 parent 4a2bc64 commit 003cdbc

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/Common/Config/CMakeLists.txt

+12-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@ set (SRCS
88
)
99

1010
add_library(clickhouse_common_config ${SRCS})
11-
1211
target_link_libraries(clickhouse_common_config
12+
PUBLIC
13+
clickhouse_common_zookeeper
14+
common
15+
Poco::XML
16+
PRIVATE
17+
string_utils
18+
)
19+
20+
add_library(clickhouse_common_config_no_zookeeper_log ${SRCS})
21+
target_link_libraries(clickhouse_common_config_no_zookeeper_log
1322
PUBLIC
1423
clickhouse_common_zookeeper_no_log
1524
common
@@ -19,8 +28,6 @@ target_link_libraries(clickhouse_common_config
1928
)
2029

2130
if (USE_YAML_CPP)
22-
target_link_libraries(clickhouse_common_config
23-
PRIVATE
24-
yaml-cpp
25-
)
31+
target_link_libraries(clickhouse_common_config PRIVATE yaml-cpp)
32+
target_link_libraries(clickhouse_common_config_no_zookeeper_log PRIVATE yaml-cpp)
2633
endif()

utils/config-processor/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
add_executable (config-processor config-processor.cpp)
2-
target_link_libraries(config-processor PRIVATE clickhouse_common_config)
2+
target_link_libraries(config-processor PRIVATE clickhouse_common_config_no_zookeeper_log)

0 commit comments

Comments
 (0)