Skip to content

Commit f0c00d8

Browse files
committed
Fix linking of examples
1 parent 7286d0e commit f0c00d8

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
clickhouse_add_executable (mysqlxx_pool_test mysqlxx_pool_test.cpp)
2-
target_link_libraries (mysqlxx_pool_test PRIVATE mysqlxx dbms clickhouse_common_config loggers_no_text_log clickhouse_functions_extractkeyvaluepairs)
2+
target_link_libraries (mysqlxx_pool_test PRIVATE mysqlxx dbms clickhouse_common_config loggers_no_text_log)

src/Functions/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ add_subdirectory(JSONPath)
140140
list (APPEND PRIVATE_LIBS clickhouse_functions_jsonpath)
141141

142142
add_subdirectory(keyvaluepair)
143-
list (APPEND OBJECT_LIBS $<TARGET_OBJECTS:clickhouse_functions_extractkeyvaluepairs>)
144143

145144
# Signed integer overflow on user-provided data inside boost::geometry - ignore.
146145
set_source_files_properties("pointInPolygon.cpp" PROPERTIES COMPILE_FLAGS -fno-sanitize=signed-integer-overflow)

src/Functions/keyvaluepair/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
22
add_headers_and_sources(clickhouse_functions_extractkeyvaluepairs .)
33
add_headers_and_sources(clickhouse_functions_extractkeyvaluepairs impl)
44

5-
add_library(clickhouse_functions_extractkeyvaluepairs ${clickhouse_functions_extractkeyvaluepairs_sources} ${clickhouse_functions_extractkeyvaluepairs_headers})
6-
7-
target_link_libraries(clickhouse_functions_extractkeyvaluepairs PRIVATE dbms)
5+
# Used in VirtualColumnsUtils (makeExtractor)
6+
extract_into_parent_list(clickhouse_functions_extractkeyvaluepairs_sources dbms_sources ${clickhouse_functions_extractkeyvaluepairs_sources})
7+
extract_into_parent_list(clickhouse_functions_extractkeyvaluepairs_headers dbms_headers ${clickhouse_functions_extractkeyvaluepairs_headers})

0 commit comments

Comments
 (0)