thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better link and deps (#3631)

Browse Source 
* try fix 1

* Better deps

* fix

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix

* fix

* fix

* disable old

* Update find_odbc.cmake
This commit is contained in:
proller 2018-11-21 22:20:27 +03:00 committed by alexey-milovidov
parent 06187e9a98
commit 1d40c2c871
53 changed files with 253 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/find_odbc.cmake
View File

@ -71,10 +71,10 @@ if (ENABLE_ODBC)
) )
# MinGW find usually fails # MinGW find usually fails
if(MINGW) if (MINGW)
set(ODBC_INCLUDE_DIRECTORIES ".") set(ODBC_INCLUDE_DIRECTORIES ".")
set(ODBC_LIBRARIES odbc32) set(ODBC_LIBRARIES odbc32)
endif() endif ()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ODBC find_package_handle_standard_args(ODBC
@ -82,6 +82,10 @@ if (ENABLE_ODBC)
ODBC_INCLUDE_DIRECTORIES ODBC_INCLUDE_DIRECTORIES
ODBC_LIBRARIES) ODBC_LIBRARIES)
if (USE_STATIC_LIBRARIES)
list(APPEND ODBC_LIBRARIES ${LTDL_LIBRARY})
endif ()
mark_as_advanced(ODBC_FOUND ODBC_LIBRARIES ODBC_INCLUDE_DIRECTORIES) mark_as_advanced(ODBC_FOUND ODBC_LIBRARIES ODBC_INCLUDE_DIRECTORIES)
endif () endif ()
endif () endif ()

4
cmake/find_poco.cmake
View File

@ -93,8 +93,8 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
endif () endif ()
if (OPENSSL_FOUND AND (NOT DEFINED ENABLE_POCO_NETSSL OR ENABLE_POCO_NETSSL)) if (OPENSSL_FOUND AND (NOT DEFINED ENABLE_POCO_NETSSL OR ENABLE_POCO_NETSSL))
set (Poco_NetSSL_LIBRARY PocoNetSSL) set (Poco_NetSSL_LIBRARY PocoNetSSL ${OPENSSL_LIBRARIES})
set (Poco_Crypto_LIBRARY PocoCrypto) set (Poco_Crypto_LIBRARY PocoCrypto ${OPENSSL_LIBRARIES})
endif () endif ()
if (USE_STATIC_LIBRARIES AND USE_INTERNAL_ZLIB_LIBRARY) if (USE_STATIC_LIBRARIES AND USE_INTERNAL_ZLIB_LIBRARY)

1
cmake/lib_name.cmake
View File

@ -1,5 +1,4 @@
set(DIVIDE_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libdivide) set(DIVIDE_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libdivide)
set(CITYHASH_CONTRIB_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/cityhash102/include)
set(COMMON_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/libs/libcommon/include ${ClickHouse_BINARY_DIR}/libs/libcommon/include) set(COMMON_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/libs/libcommon/include ${ClickHouse_BINARY_DIR}/libs/libcommon/include)
set(DBMS_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/dbms/src ${ClickHouse_BINARY_DIR}/dbms/src) set(DBMS_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/dbms/src ${ClickHouse_BINARY_DIR}/dbms/src)
set(DOUBLE_CONVERSION_CONTRIB_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/double-conversion) set(DOUBLE_CONVERSION_CONTRIB_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/double-conversion)

3
cmake/print_include_directories.cmake
View File

@ -10,6 +10,9 @@ list(APPEND dirs ${dirs1})
get_property (dirs1 TARGET common PROPERTY INCLUDE_DIRECTORIES) get_property (dirs1 TARGET common PROPERTY INCLUDE_DIRECTORIES)
list(APPEND dirs ${dirs1}) list(APPEND dirs ${dirs1})
get_property (dirs1 TARGET cityhash PROPERTY INCLUDE_DIRECTORIES)
list(APPEND dirs ${dirs1})
if (USE_INTERNAL_BOOST_LIBRARY) if (USE_INTERNAL_BOOST_LIBRARY)
get_property (dirs1 TARGET ${Boost_PROGRAM_OPTIONS_LIBRARY} PROPERTY INCLUDE_DIRECTORIES) get_property (dirs1 TARGET ${Boost_PROGRAM_OPTIONS_LIBRARY} PROPERTY INCLUDE_DIRECTORIES)
list(APPEND dirs ${dirs1}) list(APPEND dirs ${dirs1})

5
contrib/cityhash102/CMakeLists.txt
View File

@ -1,9 +1,8 @@
add_library(cityhash add_library(cityhash
src/city.cc src/city.cc
include/citycrc.h include/citycrc.h
include/city.h include/city.h
src/config.h) src/config.h)
target_include_directories (cityhash BEFORE PUBLIC include) target_include_directories(cityhash BEFORE PUBLIC include)
target_include_directories (cityhash PRIVATE src) target_include_directories(cityhash PRIVATE src)

51
dbms/CMakeLists.txt
View File

@ -119,7 +119,7 @@ endif ()
if (USE_EMBEDDED_COMPILER) if (USE_EMBEDDED_COMPILER)
llvm_libs_all(REQUIRED_LLVM_LIBRARIES) llvm_libs_all(REQUIRED_LLVM_LIBRARIES)
target_link_libraries (dbms ${REQUIRED_LLVM_LIBRARIES}) target_link_libraries (dbms PRIVATE ${REQUIRED_LLVM_LIBRARIES})
target_include_directories (dbms SYSTEM BEFORE PUBLIC ${LLVM_INCLUDE_DIRS}) target_include_directories (dbms SYSTEM BEFORE PUBLIC ${LLVM_INCLUDE_DIRS})
endif () endif ()
@ -150,33 +150,48 @@ if (NOT ARCH_ARM AND CPUID_LIBRARY)
endif() endif()
target_link_libraries (clickhouse_common_io target_link_libraries (clickhouse_common_io
PUBLIC
common common
PRIVATE
string_utils string_utils
widechar_width widechar_width
${LINK_LIBRARIES_ONLY_ON_X86_64} ${LINK_LIBRARIES_ONLY_ON_X86_64}
${LZ4_LIBRARY} ${LZ4_LIBRARY}
${ZSTD_LIBRARY} ${ZSTD_LIBRARY}
${DOUBLE_CONVERSION_LIBRARIES} ${DOUBLE_CONVERSION_LIBRARIES}
pocoext
PUBLIC
${Poco_Net_LIBRARY} ${Poco_Net_LIBRARY}
${Poco_Util_LIBRARY} ${Poco_Util_LIBRARY}
${Poco_Foundation_LIBRARY} ${Poco_Foundation_LIBRARY}
${RE2_LIBRARY}
${RE2_ST_LIBRARY}
${CITYHASH_LIBRARIES}
PRIVATE
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${EXECINFO_LIBRARY} ${EXECINFO_LIBRARY}
${ELF_LIBRARY} ${ELF_LIBRARY}
PUBLIC
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
PRIVATE
apple_rt apple_rt
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
) )
target_link_libraries (dbms target_link_libraries (dbms
PRIVATE
clickhouse_parsers clickhouse_parsers
clickhouse_common_config clickhouse_common_config
PUBLIC
clickhouse_common_io clickhouse_common_io
pocoext
PUBLIC
${MYSQLXX_LIBRARY} ${MYSQLXX_LIBRARY}
${RE2_LIBRARY} PRIVATE
${RE2_ST_LIBRARY}
${BTRIE_LIBRARIES} ${BTRIE_LIBRARIES}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
PUBLIC
${Boost_SYSTEM_LIBRARY}
) )
if (NOT USE_INTERNAL_RE2_LIBRARY) if (NOT USE_INTERNAL_RE2_LIBRARY)
@ -193,8 +208,8 @@ if (Poco_SQL_FOUND AND NOT USE_INTERNAL_POCO_LIBRARY)
endif() endif()
if (USE_POCO_SQLODBC) if (USE_POCO_SQLODBC)
target_link_libraries (clickhouse_common_io ${Poco_SQL_LIBRARY}) target_link_libraries (clickhouse_common_io PRIVATE ${Poco_SQL_LIBRARY})
target_link_libraries (dbms ${Poco_SQLODBC_LIBRARY} ${Poco_SQL_LIBRARY}) target_link_libraries (dbms PRIVATE ${Poco_SQLODBC_LIBRARY} ${Poco_SQL_LIBRARY})
if (NOT USE_INTERNAL_POCO_LIBRARY) if (NOT USE_INTERNAL_POCO_LIBRARY)
target_include_directories (clickhouse_common_io SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQL_INCLUDE_DIR}) target_include_directories (clickhouse_common_io SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQL_INCLUDE_DIR})
target_include_directories (dbms SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQLODBC_INCLUDE_DIR} PUBLIC ${Poco_SQL_INCLUDE_DIR}) target_include_directories (dbms SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQLODBC_INCLUDE_DIR} PUBLIC ${Poco_SQL_INCLUDE_DIR})
@ -208,48 +223,44 @@ if (Poco_Data_FOUND)
endif() endif()
if (USE_POCO_DATAODBC) if (USE_POCO_DATAODBC)
target_link_libraries (clickhouse_common_io ${Poco_Data_LIBRARY}) target_link_libraries (clickhouse_common_io PRIVATE ${Poco_Data_LIBRARY})
target_link_libraries (dbms ${Poco_DataODBC_LIBRARY}) target_link_libraries (dbms PRIVATE ${Poco_DataODBC_LIBRARY})
if (NOT USE_INTERNAL_POCO_LIBRARY) if (NOT USE_INTERNAL_POCO_LIBRARY)
target_include_directories (dbms SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_DataODBC_INCLUDE_DIR}) target_include_directories (dbms SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_DataODBC_INCLUDE_DIR})
endif() endif()
endif() endif()
if (USE_POCO_MONGODB) if (USE_POCO_MONGODB)
target_link_libraries (dbms ${Poco_MongoDB_LIBRARY}) target_link_libraries (dbms PRIVATE ${Poco_MongoDB_LIBRARY})
endif() endif()
if (USE_POCO_NETSSL) if (USE_POCO_NETSSL)
target_link_libraries (clickhouse_common_io ${Poco_NetSSL_LIBRARY} ${Poco_Crypto_LIBRARY}) target_link_libraries (clickhouse_common_io PRIVATE ${Poco_NetSSL_LIBRARY} ${Poco_Crypto_LIBRARY})
target_link_libraries (dbms ${Poco_NetSSL_LIBRARY} ${Poco_Crypto_LIBRARY}) target_link_libraries (dbms PRIVATE ${Poco_NetSSL_LIBRARY} ${Poco_Crypto_LIBRARY})
endif() endif()
target_link_libraries (dbms ${Poco_Foundation_LIBRARY}) target_link_libraries (dbms PRIVATE ${Poco_Foundation_LIBRARY})
if (USE_ICU) if (USE_ICU)
target_link_libraries (dbms ${ICU_LIBS}) target_link_libraries (dbms PRIVATE ${ICU_LIBS})
target_include_directories (dbms SYSTEM PRIVATE ${ICU_INCLUDE_DIR}) target_include_directories (dbms SYSTEM PRIVATE ${ICU_INCLUDE_DIR})
endif () endif ()
if (USE_CAPNP) if (USE_CAPNP)
target_link_libraries (dbms ${CAPNP_LIBRARY}) target_link_libraries (dbms PRIVATE ${CAPNP_LIBRARY})
if (NOT USE_INTERNAL_CAPNP_LIBRARY) if (NOT USE_INTERNAL_CAPNP_LIBRARY)
target_include_directories (dbms SYSTEM BEFORE PRIVATE ${CAPNP_INCLUDE_DIR}) target_include_directories (dbms SYSTEM BEFORE PRIVATE ${CAPNP_INCLUDE_DIR})
endif () endif ()
endif () endif ()
if (USE_RDKAFKA) if (USE_RDKAFKA)
target_link_libraries (dbms ${RDKAFKA_LIBRARY}) target_link_libraries (dbms PRIVATE ${RDKAFKA_LIBRARY})
if (NOT USE_INTERNAL_RDKAFKA_LIBRARY) if (NOT USE_INTERNAL_RDKAFKA_LIBRARY)
target_include_directories (dbms SYSTEM BEFORE PRIVATE ${RDKAFKA_INCLUDE_DIR}) target_include_directories (dbms SYSTEM BEFORE PRIVATE ${RDKAFKA_INCLUDE_DIR})
endif () endif ()
endif () endif ()
target_link_libraries(dbms ${OPENSSL_CRYPTO_LIBRARY}) target_link_libraries(dbms PRIVATE ${OPENSSL_CRYPTO_LIBRARY} Threads::Threads)
target_link_libraries (dbms
Threads::Threads
)
target_include_directories (dbms SYSTEM BEFORE PRIVATE ${DIVIDE_INCLUDE_DIR}) target_include_directories (dbms SYSTEM BEFORE PRIVATE ${DIVIDE_INCLUDE_DIR})
target_include_directories (dbms SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) target_include_directories (dbms SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
@ -285,6 +296,6 @@ if (ENABLE_TESTS)
# attach all dbms gtest sources # attach all dbms gtest sources
grep_gtest_sources(${ClickHouse_SOURCE_DIR}/dbms dbms_gtest_sources) grep_gtest_sources(${ClickHouse_SOURCE_DIR}/dbms dbms_gtest_sources)
add_executable(unit_tests_dbms ${dbms_gtest_sources}) add_executable(unit_tests_dbms ${dbms_gtest_sources})
target_link_libraries(unit_tests_dbms gtest_main dbms) target_link_libraries(unit_tests_dbms PRIVATE gtest_main dbms clickhouse_common_zookeeper)
add_check(unit_tests_dbms) add_check(unit_tests_dbms)
endif () endif ()

26
dbms/programs/CMakeLists.txt
View File

@ -48,45 +48,45 @@ else ()
link_directories (${LLVM_LIBRARY_DIRS}) link_directories (${LLVM_LIBRARY_DIRS})
endif () endif ()
add_executable (clickhouse main.cpp) add_executable (clickhouse main.cpp)
target_link_libraries (clickhouse clickhouse_common_io) target_link_libraries (clickhouse PRIVATE clickhouse_common_io)
target_include_directories (clickhouse BEFORE PRIVATE ${COMMON_INCLUDE_DIR}) target_include_directories (clickhouse BEFORE PRIVATE ${COMMON_INCLUDE_DIR})
target_include_directories (clickhouse PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories (clickhouse PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
if (ENABLE_CLICKHOUSE_SERVER) if (ENABLE_CLICKHOUSE_SERVER)
target_link_libraries (clickhouse clickhouse-server-lib) target_link_libraries (clickhouse PRIVATE clickhouse-server-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_CLIENT) if (ENABLE_CLICKHOUSE_CLIENT)
target_link_libraries (clickhouse clickhouse-client-lib) target_link_libraries (clickhouse PRIVATE clickhouse-client-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_LOCAL) if (ENABLE_CLICKHOUSE_LOCAL)
target_link_libraries (clickhouse clickhouse-local-lib) target_link_libraries (clickhouse PRIVATE clickhouse-local-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_BENCHMARK) if (ENABLE_CLICKHOUSE_BENCHMARK)
target_link_libraries (clickhouse clickhouse-benchmark-lib) target_link_libraries (clickhouse PRIVATE clickhouse-benchmark-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_PERFORMANCE) if (ENABLE_CLICKHOUSE_PERFORMANCE)
target_link_libraries (clickhouse clickhouse-performance-test-lib) target_link_libraries (clickhouse PRIVATE clickhouse-performance-test-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_COPIER) if (ENABLE_CLICKHOUSE_COPIER)
target_link_libraries (clickhouse clickhouse-copier-lib) target_link_libraries (clickhouse PRIVATE clickhouse-copier-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG) if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
target_link_libraries (clickhouse clickhouse-extract-from-config-lib) target_link_libraries (clickhouse PRIVATE clickhouse-extract-from-config-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_COMPRESSOR) if (ENABLE_CLICKHOUSE_COMPRESSOR)
target_link_libraries (clickhouse clickhouse-compressor-lib) target_link_libraries (clickhouse PRIVATE clickhouse-compressor-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_FORMAT) if (ENABLE_CLICKHOUSE_FORMAT)
target_link_libraries (clickhouse clickhouse-format-lib) target_link_libraries (clickhouse PRIVATE clickhouse-format-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_OBFUSCATOR) if (ENABLE_CLICKHOUSE_OBFUSCATOR)
target_link_libraries (clickhouse clickhouse-obfuscator-lib) target_link_libraries (clickhouse PRIVATE clickhouse-obfuscator-lib)
endif () endif ()
if (USE_EMBEDDED_COMPILER) if (USE_EMBEDDED_COMPILER)
target_link_libraries (clickhouse clickhouse-compiler-lib) target_link_libraries (clickhouse PRIVATE clickhouse-compiler-lib)
endif () endif ()
if (ENABLE_CLICKHOUSE_ODBC_BRIDGE) if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
target_link_libraries (clickhouse clickhouse-odbc-bridge-lib) target_link_libraries (clickhouse PRIVATE clickhouse-odbc-bridge-lib)
endif() endif()
set (CLICKHOUSE_BUNDLE) set (CLICKHOUSE_BUNDLE)

4
dbms/programs/benchmark/CMakeLists.txt
View File

@ -1,8 +1,8 @@
add_library (clickhouse-benchmark-lib ${LINK_MODE} Benchmark.cpp) add_library (clickhouse-benchmark-lib ${LINK_MODE} Benchmark.cpp)
target_link_libraries (clickhouse-benchmark-lib clickhouse-client-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-benchmark-lib PRIVATE clickhouse-client-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
target_include_directories (clickhouse-benchmark-lib SYSTEM PRIVATE ${PCG_RANDOM_INCLUDE_DIR}) target_include_directories (clickhouse-benchmark-lib SYSTEM PRIVATE ${PCG_RANDOM_INCLUDE_DIR})
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-benchmark clickhouse-benchmark.cpp) add_executable (clickhouse-benchmark clickhouse-benchmark.cpp)
target_link_libraries (clickhouse-benchmark clickhouse-benchmark-lib clickhouse_aggregate_functions) target_link_libraries (clickhouse-benchmark PRIVATE clickhouse-benchmark-lib clickhouse_aggregate_functions)
endif () endif ()

4
dbms/programs/clang/CMakeLists.txt
View File

@ -6,9 +6,9 @@ if (CLICKHOUSE_SPLIT_BINARY)
if (USE_EMBEDDED_COMPILER) if (USE_EMBEDDED_COMPILER)
link_directories (${LLVM_LIBRARY_DIRS}) link_directories (${LLVM_LIBRARY_DIRS})
add_executable (clickhouse-clang clickhouse-clang.cpp) add_executable (clickhouse-clang clickhouse-clang.cpp)
target_link_libraries (clickhouse-clang clickhouse-compiler-lib) target_link_libraries (clickhouse-clang PRIVATE clickhouse-compiler-lib)
add_executable (clickhouse-lld clickhouse-lld.cpp) add_executable (clickhouse-lld clickhouse-lld.cpp)
target_link_libraries (clickhouse-lld clickhouse-compiler-lib) target_link_libraries (clickhouse-lld PRIVATE clickhouse-compiler-lib)
install (TARGETS clickhouse-clang clickhouse-lld RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse) install (TARGETS clickhouse-clang clickhouse-lld RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
endif () endif ()
endif () endif ()

5
dbms/programs/client/CMakeLists.txt
View File

@ -1,13 +1,12 @@
add_library (clickhouse-client-lib ${LINK_MODE} Client.cpp) add_library (clickhouse-client-lib ${LINK_MODE} Client.cpp)
target_link_libraries (clickhouse-client-lib clickhouse_common_io clickhouse_functions clickhouse_aggregate_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-client-lib PRIVATE clickhouse_common_io clickhouse_functions clickhouse_aggregate_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (READLINE_INCLUDE_DIR) if (READLINE_INCLUDE_DIR)
target_include_directories (clickhouse-client-lib SYSTEM PRIVATE ${READLINE_INCLUDE_DIR}) target_include_directories (clickhouse-client-lib SYSTEM PRIVATE ${READLINE_INCLUDE_DIR})
endif () endif ()
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-client clickhouse-client.cpp) add_executable (clickhouse-client clickhouse-client.cpp)
target_link_libraries (clickhouse-client clickhouse-client-lib) target_link_libraries (clickhouse-client PRIVATE clickhouse-client-lib)
endif () endif ()
install (FILES clickhouse-client.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-client COMPONENT clickhouse-client RENAME config.xml) install (FILES clickhouse-client.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-client COMPONENT clickhouse-client RENAME config.xml)

4
dbms/programs/compressor/CMakeLists.txt
View File

@ -1,8 +1,8 @@
add_library (clickhouse-compressor-lib ${LINK_MODE} Compressor.cpp) add_library (clickhouse-compressor-lib ${LINK_MODE} Compressor.cpp)
target_link_libraries (clickhouse-compressor-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-compressor-lib PRIVATE clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
# Also in utils # Also in utils
add_executable (clickhouse-compressor clickhouse-compressor.cpp) add_executable (clickhouse-compressor clickhouse-compressor.cpp)
target_link_libraries (clickhouse-compressor clickhouse-compressor-lib) target_link_libraries (clickhouse-compressor PRIVATE clickhouse-compressor-lib)
endif () endif ()

2
dbms/programs/copier/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_library (clickhouse-copier-lib ${LINK_MODE} ClusterCopier.cpp) add_library (clickhouse-copier-lib ${LINK_MODE} ClusterCopier.cpp)
target_link_libraries (clickhouse-copier-lib clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions) target_link_libraries (clickhouse-copier-lib PRIVATE clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions daemon)
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-copier clickhouse-copier.cpp) add_executable (clickhouse-copier clickhouse-copier.cpp)

4
dbms/programs/extract-from-config/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_library (clickhouse-extract-from-config-lib ${LINK_MODE} ExtractFromConfig.cpp) add_library (clickhouse-extract-from-config-lib ${LINK_MODE} ExtractFromConfig.cpp)
target_link_libraries (clickhouse-extract-from-config-lib clickhouse_common_config clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-extract-from-config-lib PRIVATE clickhouse_common_config clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-extract-from-config clickhouse-extract-from-config.cpp) add_executable (clickhouse-extract-from-config clickhouse-extract-from-config.cpp)
target_link_libraries (clickhouse-extract-from-config clickhouse-extract-from-config-lib) target_link_libraries (clickhouse-extract-from-config PRIVATE clickhouse-extract-from-config-lib)
endif () endif ()

4
dbms/programs/format/CMakeLists.txt
View File

@ -1,6 +1,6 @@
add_library (clickhouse-format-lib ${LINK_MODE} Format.cpp) add_library (clickhouse-format-lib ${LINK_MODE} Format.cpp)
target_link_libraries (clickhouse-format-lib dbms clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-format-lib PRIVATE dbms clickhouse_common_io clickhouse_parsers ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-format clickhouse-format.cpp) add_executable (clickhouse-format clickhouse-format.cpp)
target_link_libraries (clickhouse-format clickhouse-format-lib) target_link_libraries (clickhouse-format PRIVATE clickhouse-format-lib)
endif () endif ()

4
dbms/programs/local/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_library (clickhouse-local-lib ${LINK_MODE} LocalServer.cpp) add_library (clickhouse-local-lib ${LINK_MODE} LocalServer.cpp)
target_link_libraries (clickhouse-local-lib clickhouse_common_io clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-local-lib PRIVATE clickhouse_common_io clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-local clickhouse-local.cpp) add_executable (clickhouse-local clickhouse-local.cpp)
target_link_libraries (clickhouse-local clickhouse-local-lib) target_link_libraries (clickhouse-local PRIVATE clickhouse-local-lib)
endif () endif ()

4
dbms/programs/obfuscator/CMakeLists.txt
View File

@ -1,8 +1,8 @@
add_library (clickhouse-obfuscator-lib ${LINK_MODE} Obfuscator.cpp) add_library (clickhouse-obfuscator-lib ${LINK_MODE} Obfuscator.cpp)
target_link_libraries (clickhouse-obfuscator-lib dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-obfuscator-lib PRIVATE dbms ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-obfuscator clickhouse-obfuscator.cpp) add_executable (clickhouse-obfuscator clickhouse-obfuscator.cpp)
set_target_properties(clickhouse-obfuscator PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..) set_target_properties(clickhouse-obfuscator PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
target_link_libraries (clickhouse-obfuscator clickhouse-obfuscator-lib) target_link_libraries (clickhouse-obfuscator PRIVATE clickhouse-obfuscator-lib)
endif () endif ()

12
dbms/programs/odbc-bridge/CMakeLists.txt
View File

@ -9,23 +9,23 @@ add_library (clickhouse-odbc-bridge-lib ${LINK_MODE}
validateODBCConnectionString.cpp validateODBCConnectionString.cpp
) )
target_link_libraries (clickhouse-odbc-bridge-lib clickhouse_common_io daemon dbms) target_link_libraries (clickhouse-odbc-bridge-lib PRIVATE clickhouse_common_io daemon dbms)
target_include_directories (clickhouse-odbc-bridge-lib PUBLIC ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include) target_include_directories (clickhouse-odbc-bridge-lib PUBLIC ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include)
if (USE_POCO_SQLODBC) if (USE_POCO_SQLODBC)
target_link_libraries (clickhouse-odbc-bridge-lib ${Poco_SQLODBC_LIBRARY}) target_link_libraries (clickhouse-odbc-bridge-lib PRIVATE ${Poco_SQLODBC_LIBRARY})
target_include_directories (clickhouse-odbc-bridge-lib SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQLODBC_INCLUDE_DIR}) target_include_directories (clickhouse-odbc-bridge-lib SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQLODBC_INCLUDE_DIR})
endif () endif ()
if (Poco_SQL_FOUND) if (Poco_SQL_FOUND)
target_link_libraries (clickhouse-odbc-bridge-lib ${Poco_SQL_LIBRARY}) target_link_libraries (clickhouse-odbc-bridge-lib PRIVATE ${Poco_SQL_LIBRARY})
endif () endif ()
if (USE_POCO_DATAODBC) if (USE_POCO_DATAODBC)
target_link_libraries (clickhouse-odbc-bridge-lib ${Poco_DataODBC_LIBRARY}) target_link_libraries (clickhouse-odbc-bridge-lib PRIVATE ${Poco_DataODBC_LIBRARY})
target_include_directories (clickhouse-odbc-bridge-lib SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_DataODBC_INCLUDE_DIR}) target_include_directories (clickhouse-odbc-bridge-lib SYSTEM PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_DataODBC_INCLUDE_DIR})
endif() endif()
if (Poco_Data_FOUND) if (Poco_Data_FOUND)
target_link_libraries (clickhouse-odbc-bridge-lib ${Poco_Data_LIBRARY}) target_link_libraries (clickhouse-odbc-bridge-lib PRIVATE ${Poco_Data_LIBRARY})
endif () endif ()
@ -35,5 +35,5 @@ endif ()
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-odbc-bridge odbc-bridge.cpp) add_executable (clickhouse-odbc-bridge odbc-bridge.cpp)
target_link_libraries (clickhouse-odbc-bridge clickhouse-odbc-bridge-lib) target_link_libraries (clickhouse-odbc-bridge PRIVATE clickhouse-odbc-bridge-lib)
endif () endif ()

2
dbms/programs/odbc-bridge/tests/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (validate-odbc-connection-string validate-odbc-connection-string.cpp) add_executable (validate-odbc-connection-string validate-odbc-connection-string.cpp)
target_link_libraries (validate-odbc-connection-string clickhouse-odbc-bridge-lib) target_link_libraries (validate-odbc-connection-string PRIVATE clickhouse-odbc-bridge-lib clickhouse_common_io)

4
dbms/programs/performance-test/CMakeLists.txt
View File

@ -1,8 +1,8 @@
add_library (clickhouse-performance-test-lib ${LINK_MODE} PerformanceTest.cpp) add_library (clickhouse-performance-test-lib ${LINK_MODE} PerformanceTest.cpp)
target_link_libraries (clickhouse-performance-test-lib clickhouse_common_io dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (clickhouse-performance-test-lib PRIVATE dbms clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
target_include_directories (clickhouse-performance-test-lib SYSTEM PRIVATE ${PCG_RANDOM_INCLUDE_DIR}) target_include_directories (clickhouse-performance-test-lib SYSTEM PRIVATE ${PCG_RANDOM_INCLUDE_DIR})
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-performance-test clickhouse-performance-test.cpp) add_executable (clickhouse-performance-test clickhouse-performance-test.cpp)
target_link_libraries (clickhouse-performance-test clickhouse-performance-test-lib dbms) target_link_libraries (clickhouse-performance-test PRIVATE clickhouse-performance-test-lib)
endif () endif ()

8
dbms/programs/server/CMakeLists.txt
View File

@ -10,12 +10,16 @@ add_library (clickhouse-server-lib ${LINK_MODE}
TCPHandler.cpp TCPHandler.cpp
) )
target_link_libraries (clickhouse-server-lib clickhouse_common_io daemon clickhouse_storages_system clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions) target_link_libraries (clickhouse-server-lib PRIVATE clickhouse_common_io daemon clickhouse_storages_system clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions ${Poco_Net_LIBRARY})
if (USE_POCO_NETSSL)
target_link_libraries (clickhouse-server-lib PRIVATE ${Poco_NetSSL_LIBRARY} ${Poco_Crypto_LIBRARY})
endif ()
target_include_directories (clickhouse-server-lib PUBLIC ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include) target_include_directories (clickhouse-server-lib PUBLIC ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include)
if (CLICKHOUSE_SPLIT_BINARY) if (CLICKHOUSE_SPLIT_BINARY)
add_executable (clickhouse-server clickhouse-server.cpp) add_executable (clickhouse-server clickhouse-server.cpp)
target_link_libraries (clickhouse-server clickhouse-server-lib) target_link_libraries (clickhouse-server PRIVATE clickhouse-server-lib)
install (TARGETS clickhouse-server ${CLICKHOUSE_ALL_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse) install (TARGETS clickhouse-server ${CLICKHOUSE_ALL_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
endif () endif ()

2
dbms/src/AggregateFunctions/CMakeLists.txt
View File

@ -20,5 +20,5 @@ list(REMOVE_ITEM clickhouse_aggregate_functions_headers
) )
add_library(clickhouse_aggregate_functions ${LINK_MODE} ${clickhouse_aggregate_functions_sources}) add_library(clickhouse_aggregate_functions ${LINK_MODE} ${clickhouse_aggregate_functions_sources})
target_link_libraries(clickhouse_aggregate_functions dbms) target_link_libraries(clickhouse_aggregate_functions PRIVATE dbms)
target_include_directories (clickhouse_aggregate_functions BEFORE PRIVATE ${COMMON_INCLUDE_DIR}) target_include_directories (clickhouse_aggregate_functions BEFORE PRIVATE ${COMMON_INCLUDE_DIR})

5
dbms/src/Common/Config/CMakeLists.txt
View File

@ -1,9 +1,8 @@
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_headers_and_sources(clickhouse_common_config .) add_headers_and_sources(clickhouse_common_config .)
add_library(clickhouse_common_config ${LINK_MODE} ${clickhouse_common_config_headers} ${clickhouse_common_config_sources}) add_library(clickhouse_common_config ${LINK_MODE} ${clickhouse_common_config_headers} ${clickhouse_common_config_sources})
target_link_libraries (clickhouse_common_config clickhouse_common_zookeeper string_utils ${Poco_XML_LIBRARY} ${Poco_Util_LIBRARY}) target_link_libraries(clickhouse_common_config PUBLIC common PRIVATE clickhouse_common_zookeeper string_utils PUBLIC ${Poco_XML_LIBRARY} ${Poco_Util_LIBRARY})
target_include_directories (clickhouse_common_config PRIVATE ${DBMS_INCLUDE_DIR}) target_include_directories(clickhouse_common_config PUBLIC ${DBMS_INCLUDE_DIR})

3
dbms/src/Common/ZooKeeper/CMakeLists.txt
View File

@ -4,7 +4,8 @@ add_headers_and_sources(clickhouse_common_zookeeper .)
add_library(clickhouse_common_zookeeper ${LINK_MODE} ${clickhouse_common_zookeeper_headers} ${clickhouse_common_zookeeper_sources}) add_library(clickhouse_common_zookeeper ${LINK_MODE} ${clickhouse_common_zookeeper_headers} ${clickhouse_common_zookeeper_sources})
target_link_libraries (clickhouse_common_zookeeper clickhouse_common_io) target_link_libraries (clickhouse_common_zookeeper PUBLIC clickhouse_common_io common PRIVATE string_utils PUBLIC ${Poco_Util_LIBRARY})
target_include_directories(clickhouse_common_zookeeper PUBLIC ${DBMS_INCLUDE_DIR})
if (ENABLE_TESTS) if (ENABLE_TESTS)
add_subdirectory (tests) add_subdirectory (tests)

16
dbms/src/Common/ZooKeeper/tests/CMakeLists.txt
View File

@ -1,23 +1,23 @@
add_executable(zkutil_test_commands zkutil_test_commands.cpp) add_executable(zkutil_test_commands zkutil_test_commands.cpp)
target_link_libraries(zkutil_test_commands clickhouse_common_zookeeper) target_link_libraries(zkutil_test_commands PRIVATE clickhouse_common_zookeeper)
add_executable(zkutil_test_commands_new_lib zkutil_test_commands_new_lib.cpp) add_executable(zkutil_test_commands_new_lib zkutil_test_commands_new_lib.cpp)
target_link_libraries(zkutil_test_commands_new_lib clickhouse_common_zookeeper) target_link_libraries(zkutil_test_commands_new_lib PRIVATE clickhouse_common_zookeeper)
add_executable(zkutil_test_lock zkutil_test_lock.cpp) add_executable(zkutil_test_lock zkutil_test_lock.cpp)
target_link_libraries(zkutil_test_lock clickhouse_common_zookeeper) target_link_libraries(zkutil_test_lock PRIVATE clickhouse_common_zookeeper)
add_executable(zkutil_expiration_test zkutil_expiration_test.cpp) add_executable(zkutil_expiration_test zkutil_expiration_test.cpp)
target_link_libraries(zkutil_expiration_test clickhouse_common_zookeeper) target_link_libraries(zkutil_expiration_test PRIVATE clickhouse_common_zookeeper)
add_executable(zkutil_test_async zkutil_test_async.cpp) add_executable(zkutil_test_async zkutil_test_async.cpp)
target_link_libraries(zkutil_test_async clickhouse_common_zookeeper) target_link_libraries(zkutil_test_async PRIVATE clickhouse_common_zookeeper)
add_executable(zkutil_zookeeper_holder zkutil_zookeeper_holder.cpp) add_executable(zkutil_zookeeper_holder zkutil_zookeeper_holder.cpp)
target_link_libraries(zkutil_zookeeper_holder clickhouse_common_zookeeper) target_link_libraries(zkutil_zookeeper_holder PRIVATE clickhouse_common_zookeeper)
add_executable (zk_many_watches_reconnect zk_many_watches_reconnect.cpp) add_executable (zk_many_watches_reconnect zk_many_watches_reconnect.cpp)
target_link_libraries (zk_many_watches_reconnect clickhouse_common_zookeeper clickhouse_common_config) target_link_libraries (zk_many_watches_reconnect PRIVATE clickhouse_common_zookeeper clickhouse_common_config)
add_executable (zookeeper_impl zookeeper_impl.cpp) add_executable (zookeeper_impl zookeeper_impl.cpp)
target_link_libraries (zookeeper_impl clickhouse_common_zookeeper) target_link_libraries (zookeeper_impl PRIVATE clickhouse_common_zookeeper)

48
dbms/src/Common/tests/CMakeLists.txt
View File

@ -1,73 +1,73 @@
add_executable (hashes_test hashes_test.cpp) add_executable (hashes_test hashes_test.cpp)
target_link_libraries (hashes_test dbms) target_link_libraries (hashes_test PRIVATE dbms)
add_executable (sip_hash sip_hash.cpp) add_executable (sip_hash sip_hash.cpp)
target_link_libraries (sip_hash clickhouse_common_io) target_link_libraries (sip_hash PRIVATE clickhouse_common_io)
add_executable (sip_hash_perf sip_hash_perf.cpp) add_executable (sip_hash_perf sip_hash_perf.cpp)
target_link_libraries (sip_hash_perf clickhouse_common_io) target_link_libraries (sip_hash_perf PRIVATE clickhouse_common_io)
add_executable (auto_array auto_array.cpp) add_executable (auto_array auto_array.cpp)
target_link_libraries (auto_array clickhouse_common_io) target_link_libraries (auto_array PRIVATE clickhouse_common_io)
add_executable (lru_cache lru_cache.cpp) add_executable (lru_cache lru_cache.cpp)
target_link_libraries (lru_cache clickhouse_common_io) target_link_libraries (lru_cache PRIVATE clickhouse_common_io)
add_executable (hash_table hash_table.cpp) add_executable (hash_table hash_table.cpp)
target_link_libraries (hash_table clickhouse_common_io) target_link_libraries (hash_table PRIVATE clickhouse_common_io)
add_executable (small_table small_table.cpp) add_executable (small_table small_table.cpp)
target_link_libraries (small_table clickhouse_common_io) target_link_libraries (small_table PRIVATE clickhouse_common_io)
add_executable (parallel_aggregation parallel_aggregation.cpp) add_executable (parallel_aggregation parallel_aggregation.cpp)
target_link_libraries (parallel_aggregation clickhouse_common_io) target_link_libraries (parallel_aggregation PRIVATE clickhouse_common_io)
add_executable (parallel_aggregation2 parallel_aggregation2.cpp) add_executable (parallel_aggregation2 parallel_aggregation2.cpp)
target_link_libraries (parallel_aggregation2 clickhouse_common_io) target_link_libraries (parallel_aggregation2 PRIVATE clickhouse_common_io)
add_executable (int_hashes_perf int_hashes_perf.cpp AvalancheTest.cpp Random.cpp) add_executable (int_hashes_perf int_hashes_perf.cpp AvalancheTest.cpp Random.cpp)
target_link_libraries (int_hashes_perf clickhouse_common_io) target_link_libraries (int_hashes_perf PRIVATE clickhouse_common_io)
add_executable (simple_cache simple_cache.cpp) add_executable (simple_cache simple_cache.cpp)
target_include_directories (simple_cache PRIVATE ${DBMS_INCLUDE_DIR}) target_include_directories (simple_cache PRIVATE ${DBMS_INCLUDE_DIR})
target_link_libraries (simple_cache common) target_link_libraries (simple_cache PRIVATE common)
add_executable (compact_array compact_array.cpp) add_executable (compact_array compact_array.cpp)
target_link_libraries (compact_array clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY}) target_link_libraries (compact_array PRIVATE clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY})
add_executable (radix_sort radix_sort.cpp) add_executable (radix_sort radix_sort.cpp)
target_link_libraries (radix_sort clickhouse_common_io) target_link_libraries (radix_sort PRIVATE clickhouse_common_io)
add_executable (shell_command_test shell_command_test.cpp) add_executable (shell_command_test shell_command_test.cpp)
target_link_libraries (shell_command_test clickhouse_common_io) target_link_libraries (shell_command_test PRIVATE clickhouse_common_io)
add_executable (arena_with_free_lists arena_with_free_lists.cpp) add_executable (arena_with_free_lists arena_with_free_lists.cpp)
target_link_libraries (arena_with_free_lists clickhouse_common_io) target_link_libraries (arena_with_free_lists PRIVATE clickhouse_common_io)
add_executable (pod_array pod_array.cpp) add_executable (pod_array pod_array.cpp)
target_link_libraries (pod_array clickhouse_common_io) target_link_libraries (pod_array PRIVATE clickhouse_common_io)
add_executable (thread_creation_latency thread_creation_latency.cpp) add_executable (thread_creation_latency thread_creation_latency.cpp)
target_link_libraries (thread_creation_latency clickhouse_common_io) target_link_libraries (thread_creation_latency PRIVATE clickhouse_common_io)
add_executable (thread_pool thread_pool.cpp) add_executable (thread_pool thread_pool.cpp)
target_link_libraries (thread_pool clickhouse_common_io) target_link_libraries (thread_pool PRIVATE clickhouse_common_io)
add_executable (array_cache array_cache.cpp) add_executable (array_cache array_cache.cpp)
target_link_libraries (array_cache clickhouse_common_io) target_link_libraries (array_cache PRIVATE clickhouse_common_io)
add_executable (space_saving space_saving.cpp) add_executable (space_saving space_saving.cpp)
target_link_libraries (space_saving clickhouse_common_io) target_link_libraries (space_saving PRIVATE clickhouse_common_io)
add_executable (integer_hash_tables_and_hashes integer_hash_tables_and_hashes.cpp) add_executable (integer_hash_tables_and_hashes integer_hash_tables_and_hashes.cpp)
target_include_directories (integer_hash_tables_and_hashes SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) target_include_directories (integer_hash_tables_and_hashes SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
target_link_libraries (integer_hash_tables_and_hashes clickhouse_common_io) target_link_libraries (integer_hash_tables_and_hashes PRIVATE clickhouse_common_io)
add_executable (allocator allocator.cpp) add_executable (allocator allocator.cpp)
target_link_libraries (allocator clickhouse_common_io) target_link_libraries (allocator PRIVATE clickhouse_common_io)
add_executable (cow_columns cow_columns.cpp) add_executable (cow_columns cow_columns.cpp)
target_link_libraries (cow_columns clickhouse_common_io) target_link_libraries (cow_columns PRIVATE clickhouse_common_io)
add_executable (stopwatch stopwatch.cpp) add_executable (stopwatch stopwatch.cpp)
target_link_libraries (stopwatch clickhouse_common_io) target_link_libraries (stopwatch PRIVATE clickhouse_common_io)

12
dbms/src/Core/tests/CMakeLists.txt
View File

@ -1,18 +1,18 @@
add_executable (exception exception.cpp) add_executable (exception exception.cpp)
target_link_libraries (exception clickhouse_common_io) target_link_libraries (exception PRIVATE clickhouse_common_io)
add_executable (string_pool string_pool.cpp) add_executable (string_pool string_pool.cpp)
target_link_libraries (string_pool clickhouse_common_io) target_link_libraries (string_pool PRIVATE clickhouse_common_io)
target_include_directories (string_pool SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) target_include_directories (string_pool SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
add_executable (field field.cpp) add_executable (field field.cpp)
target_link_libraries (field dbms) target_link_libraries (field PRIVATE dbms)
add_executable (move_field move_field.cpp) add_executable (move_field move_field.cpp)
target_link_libraries (move_field clickhouse_common_io) target_link_libraries (move_field PRIVATE clickhouse_common_io)
add_executable (rvo_test rvo_test.cpp) add_executable (rvo_test rvo_test.cpp)
target_link_libraries (rvo_test Threads::Threads) target_link_libraries (rvo_test PRIVATE Threads::Threads)
add_executable (string_ref_hash string_ref_hash.cpp) add_executable (string_ref_hash string_ref_hash.cpp)
target_link_libraries (string_ref_hash clickhouse_common_io) target_link_libraries (string_ref_hash PRIVATE clickhouse_common_io)

12
dbms/src/DataStreams/tests/CMakeLists.txt
View File

@ -1,16 +1,16 @@
set(SRCS ) set(SRCS)
add_executable (expression_stream expression_stream.cpp ${SRCS}) add_executable (expression_stream expression_stream.cpp ${SRCS})
target_link_libraries (expression_stream dbms clickhouse_storages_system) target_link_libraries (expression_stream PRIVATE dbms clickhouse_storages_system clickhouse_parsers)
add_executable (filter_stream filter_stream.cpp ${SRCS}) add_executable (filter_stream filter_stream.cpp ${SRCS})
target_link_libraries (filter_stream dbms clickhouse_storages_system) target_link_libraries (filter_stream PRIVATE dbms clickhouse_storages_system clickhouse_parsers clickhouse_common_io)
add_executable (union_stream2 union_stream2.cpp ${SRCS}) add_executable (union_stream2 union_stream2.cpp ${SRCS})
target_link_libraries (union_stream2 dbms) target_link_libraries (union_stream2 PRIVATE dbms)
add_executable (collapsing_sorted_stream collapsing_sorted_stream.cpp ${SRCS}) add_executable (collapsing_sorted_stream collapsing_sorted_stream.cpp ${SRCS})
target_link_libraries (collapsing_sorted_stream dbms) target_link_libraries (collapsing_sorted_stream PRIVATE dbms)
add_executable (finish_sorting_stream finish_sorting_stream.cpp ${SRCS}) add_executable (finish_sorting_stream finish_sorting_stream.cpp ${SRCS})
target_link_libraries (finish_sorting_stream dbms) target_link_libraries (finish_sorting_stream PRIVATE dbms)

6
dbms/src/DataTypes/tests/CMakeLists.txt
View File

@ -1,10 +1,10 @@
set(SRCS ) set(SRCS )
add_executable (data_types_number_fixed data_types_number_fixed.cpp ${SRCS}) add_executable (data_types_number_fixed data_types_number_fixed.cpp ${SRCS})
target_link_libraries (data_types_number_fixed dbms) target_link_libraries (data_types_number_fixed PRIVATE dbms)
add_executable (data_type_string data_type_string.cpp ${SRCS}) add_executable (data_type_string data_type_string.cpp ${SRCS})
target_link_libraries (data_type_string dbms) target_link_libraries (data_type_string PRIVATE dbms)
add_executable (data_type_get_common_type data_type_get_common_type.cpp ${SRCS}) add_executable (data_type_get_common_type data_type_get_common_type.cpp ${SRCS})
target_link_libraries (data_type_get_common_type dbms gtest_main) target_link_libraries (data_type_get_common_type PRIVATE dbms gtest_main)

4
dbms/src/Formats/tests/CMakeLists.txt
View File

@ -1,7 +1,7 @@
set(SRCS ) set(SRCS )
add_executable (tab_separated_streams tab_separated_streams.cpp ${SRCS}) add_executable (tab_separated_streams tab_separated_streams.cpp ${SRCS})
target_link_libraries (tab_separated_streams dbms) target_link_libraries (tab_separated_streams PRIVATE dbms)
add_executable (block_row_transforms block_row_transforms.cpp ${SRCS}) add_executable (block_row_transforms block_row_transforms.cpp ${SRCS})
target_link_libraries (block_row_transforms dbms) target_link_libraries (block_row_transforms PRIVATE dbms)

2
dbms/src/Functions/tests/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (number_traits number_traits.cpp) add_executable (number_traits number_traits.cpp)
target_link_libraries (number_traits dbms) target_link_libraries (number_traits PRIVATE dbms)

54
dbms/src/IO/tests/CMakeLists.txt
View File

@ -1,84 +1,84 @@
add_executable (read_buffer read_buffer.cpp) add_executable (read_buffer read_buffer.cpp)
target_link_libraries (read_buffer clickhouse_common_io) target_link_libraries (read_buffer PRIVATE clickhouse_common_io)
add_executable (read_buffer_perf read_buffer_perf.cpp) add_executable (read_buffer_perf read_buffer_perf.cpp)
target_link_libraries (read_buffer_perf clickhouse_common_io) target_link_libraries (read_buffer_perf PRIVATE clickhouse_common_io)
add_executable (read_float_perf read_float_perf.cpp) add_executable (read_float_perf read_float_perf.cpp)
target_link_libraries (read_float_perf clickhouse_common_io) target_link_libraries (read_float_perf PRIVATE clickhouse_common_io)
add_executable (write_buffer write_buffer.cpp) add_executable (write_buffer write_buffer.cpp)
target_link_libraries (write_buffer clickhouse_common_io) target_link_libraries (write_buffer PRIVATE clickhouse_common_io)
add_executable (write_buffer_perf write_buffer_perf.cpp) add_executable (write_buffer_perf write_buffer_perf.cpp)
target_link_libraries (write_buffer_perf clickhouse_common_io) target_link_libraries (write_buffer_perf PRIVATE clickhouse_common_io)
add_executable (valid_utf8_perf valid_utf8_perf.cpp) add_executable (valid_utf8_perf valid_utf8_perf.cpp)
target_link_libraries (valid_utf8_perf clickhouse_common_io) target_link_libraries (valid_utf8_perf PRIVATE clickhouse_common_io)
add_executable (valid_utf8 valid_utf8.cpp) add_executable (valid_utf8 valid_utf8.cpp)
target_link_libraries (valid_utf8 clickhouse_common_io) target_link_libraries (valid_utf8 PRIVATE clickhouse_common_io)
add_executable (compressed_buffer compressed_buffer.cpp) add_executable (compressed_buffer compressed_buffer.cpp)
target_link_libraries (compressed_buffer clickhouse_common_io) target_link_libraries (compressed_buffer PRIVATE clickhouse_common_io)
add_executable (var_uint var_uint.cpp) add_executable (var_uint var_uint.cpp)
target_link_libraries (var_uint clickhouse_common_io) target_link_libraries (var_uint PRIVATE clickhouse_common_io)
add_executable (read_escaped_string read_escaped_string.cpp) add_executable (read_escaped_string read_escaped_string.cpp)
target_link_libraries (read_escaped_string clickhouse_common_io) target_link_libraries (read_escaped_string PRIVATE clickhouse_common_io)
add_executable (async_write async_write.cpp) add_executable (async_write async_write.cpp)
target_link_libraries (async_write clickhouse_common_io) target_link_libraries (async_write PRIVATE clickhouse_common_io)
add_executable (parse_int_perf parse_int_perf.cpp) add_executable (parse_int_perf parse_int_perf.cpp)
target_link_libraries (parse_int_perf clickhouse_common_io) target_link_libraries (parse_int_perf PRIVATE clickhouse_common_io)
add_executable (parse_int_perf2 parse_int_perf2.cpp) add_executable (parse_int_perf2 parse_int_perf2.cpp)
target_link_libraries (parse_int_perf2 clickhouse_common_io) target_link_libraries (parse_int_perf2 PRIVATE clickhouse_common_io)
add_executable (read_write_int read_write_int.cpp) add_executable (read_write_int read_write_int.cpp)
target_link_libraries (read_write_int clickhouse_common_io) target_link_libraries (read_write_int PRIVATE clickhouse_common_io)
add_executable (mempbrk mempbrk.cpp) add_executable (mempbrk mempbrk.cpp)
target_link_libraries (mempbrk clickhouse_common_io) target_link_libraries (mempbrk PRIVATE clickhouse_common_io)
add_executable (cached_compressed_read_buffer cached_compressed_read_buffer.cpp) add_executable (cached_compressed_read_buffer cached_compressed_read_buffer.cpp)
target_link_libraries (cached_compressed_read_buffer clickhouse_common_io) target_link_libraries (cached_compressed_read_buffer PRIVATE clickhouse_common_io)
add_executable (o_direct_and_dirty_pages o_direct_and_dirty_pages.cpp) add_executable (o_direct_and_dirty_pages o_direct_and_dirty_pages.cpp)
target_link_libraries (o_direct_and_dirty_pages clickhouse_common_io) target_link_libraries (o_direct_and_dirty_pages PRIVATE clickhouse_common_io)
add_executable (hashing_write_buffer hashing_write_buffer.cpp) add_executable (hashing_write_buffer hashing_write_buffer.cpp)
target_link_libraries (hashing_write_buffer clickhouse_common_io) target_link_libraries (hashing_write_buffer PRIVATE clickhouse_common_io)
add_check(hashing_write_buffer) add_check(hashing_write_buffer)
add_executable (hashing_read_buffer hashing_read_buffer.cpp) add_executable (hashing_read_buffer hashing_read_buffer.cpp)
target_link_libraries (hashing_read_buffer clickhouse_common_io) target_link_libraries (hashing_read_buffer PRIVATE clickhouse_common_io)
add_check (hashing_read_buffer) add_check (hashing_read_buffer)
add_executable (io_operators operators.cpp) add_executable (io_operators operators.cpp)
target_link_libraries (io_operators clickhouse_common_io) target_link_libraries (io_operators PRIVATE clickhouse_common_io)
if (OS_LINUX) if (OS_LINUX)
add_executable(write_buffer_aio write_buffer_aio.cpp) add_executable(write_buffer_aio write_buffer_aio.cpp)
target_link_libraries (write_buffer_aio clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY}) target_link_libraries (write_buffer_aio PRIVATE clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY})
add_executable(read_buffer_aio read_buffer_aio.cpp) add_executable(read_buffer_aio read_buffer_aio.cpp)
target_link_libraries (read_buffer_aio clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY}) target_link_libraries (read_buffer_aio PRIVATE clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY})
endif () endif ()
add_executable (zlib_buffers zlib_buffers.cpp) add_executable (zlib_buffers zlib_buffers.cpp)
target_link_libraries (zlib_buffers clickhouse_common_io) target_link_libraries (zlib_buffers PRIVATE clickhouse_common_io)
add_executable (limit_read_buffer limit_read_buffer.cpp) add_executable (limit_read_buffer limit_read_buffer.cpp)
target_link_libraries (limit_read_buffer clickhouse_common_io) target_link_libraries (limit_read_buffer PRIVATE clickhouse_common_io)
add_executable (limit_read_buffer2 limit_read_buffer2.cpp) add_executable (limit_read_buffer2 limit_read_buffer2.cpp)
target_link_libraries (limit_read_buffer2 clickhouse_common_io) target_link_libraries (limit_read_buffer2 PRIVATE clickhouse_common_io)
add_executable (parse_date_time_best_effort parse_date_time_best_effort.cpp) add_executable (parse_date_time_best_effort parse_date_time_best_effort.cpp)
target_link_libraries (parse_date_time_best_effort clickhouse_common_io) target_link_libraries (parse_date_time_best_effort PRIVATE clickhouse_common_io)
add_executable (zlib_ng_bug zlib_ng_bug.cpp) add_executable (zlib_ng_bug zlib_ng_bug.cpp)
target_link_libraries (zlib_ng_bug ${Poco_Foundation_LIBRARY}) target_link_libraries (zlib_ng_bug PRIVATE ${Poco_Foundation_LIBRARY})

34
dbms/src/Interpreters/tests/CMakeLists.txt
View File

@ -1,58 +1,58 @@
add_executable (expression expression.cpp) add_executable (expression expression.cpp)
target_link_libraries (expression dbms) target_link_libraries (expression PRIVATE dbms clickhouse_parsers)
add_executable (create_query create_query.cpp) add_executable (create_query create_query.cpp)
target_link_libraries (create_query dbms) target_link_libraries (create_query PRIVATE dbms clickhouse_parsers)
add_executable (select_query select_query.cpp) add_executable (select_query select_query.cpp)
target_link_libraries (select_query clickhouse_storages_system dbms) target_link_libraries (select_query PRIVATE clickhouse_storages_system dbms clickhouse_common_io)
add_executable (aggregate aggregate.cpp) add_executable (aggregate aggregate.cpp)
target_link_libraries (aggregate dbms) target_link_libraries (aggregate PRIVATE dbms)
add_executable (hash_map hash_map.cpp) add_executable (hash_map hash_map.cpp)
target_include_directories (hash_map SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) target_include_directories (hash_map SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
target_link_libraries (hash_map dbms) target_link_libraries (hash_map PRIVATE dbms)
add_executable (hash_map3 hash_map3.cpp) add_executable (hash_map3 hash_map3.cpp)
target_link_libraries (hash_map3 dbms ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES}) target_link_libraries (hash_map3 PRIVATE dbms ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES})
add_executable (hash_map_string hash_map_string.cpp) add_executable (hash_map_string hash_map_string.cpp)
target_include_directories (hash_map_string SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) target_include_directories (hash_map_string SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
target_link_libraries (hash_map_string dbms) target_link_libraries (hash_map_string PRIVATE dbms)
add_executable (hash_map_string_2 hash_map_string_2.cpp) add_executable (hash_map_string_2 hash_map_string_2.cpp)
target_link_libraries (hash_map_string_2 dbms) target_link_libraries (hash_map_string_2 PRIVATE dbms)
add_executable (hash_map_string_3 hash_map_string_3.cpp) add_executable (hash_map_string_3 hash_map_string_3.cpp)
target_link_libraries (hash_map_string_3 dbms ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES}) target_link_libraries (hash_map_string_3 PRIVATE dbms ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES})
add_executable (hash_map_string_small hash_map_string_small.cpp) add_executable (hash_map_string_small hash_map_string_small.cpp)
target_include_directories (hash_map_string_small SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) target_include_directories (hash_map_string_small SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
target_link_libraries (hash_map_string_small dbms) target_link_libraries (hash_map_string_small PRIVATE dbms)
add_executable (two_level_hash_map two_level_hash_map.cpp) add_executable (two_level_hash_map two_level_hash_map.cpp)
target_include_directories (two_level_hash_map SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) target_include_directories (two_level_hash_map SYSTEM BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR})
target_link_libraries (two_level_hash_map dbms) target_link_libraries (two_level_hash_map PRIVATE dbms)
add_executable (compiler_test compiler_test.cpp) add_executable (compiler_test compiler_test.cpp)
target_link_libraries (compiler_test dbms) target_link_libraries (compiler_test PRIVATE dbms)
add_executable (logical_expressions_optimizer logical_expressions_optimizer.cpp) add_executable (logical_expressions_optimizer logical_expressions_optimizer.cpp)
target_link_libraries (logical_expressions_optimizer dbms) target_link_libraries (logical_expressions_optimizer PRIVATE dbms clickhouse_parsers)
add_executable (in_join_subqueries_preprocessor in_join_subqueries_preprocessor.cpp) add_executable (in_join_subqueries_preprocessor in_join_subqueries_preprocessor.cpp)
target_link_libraries (in_join_subqueries_preprocessor dbms) target_link_libraries (in_join_subqueries_preprocessor PRIVATE dbms clickhouse_parsers)
add_check(in_join_subqueries_preprocessor) add_check(in_join_subqueries_preprocessor)
add_executable (expression_analyzer expression_analyzer.cpp) add_executable (expression_analyzer expression_analyzer.cpp)
target_link_libraries (expression_analyzer dbms clickhouse_storages_system) target_link_libraries (expression_analyzer PRIVATE dbms clickhouse_storages_system clickhouse_parsers clickhouse_common_io)
add_check(expression_analyzer) add_check(expression_analyzer)
add_executable (users users.cpp) add_executable (users users.cpp)
target_link_libraries (users dbms ${Boost_FILESYSTEM_LIBRARY}) target_link_libraries (users PRIVATE dbms clickhouse_common_config ${Boost_FILESYSTEM_LIBRARY})
if (OS_LINUX) if (OS_LINUX)
add_executable (internal_iotop internal_iotop.cpp) add_executable (internal_iotop internal_iotop.cpp)
target_link_libraries (internal_iotop dbms) target_link_libraries (internal_iotop PRIVATE dbms)
endif () endif ()

10
dbms/src/Parsers/CMakeLists.txt
View File

@ -1,9 +1,9 @@
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_headers_and_sources(clickhouse_parsers .) add_headers_and_sources(clickhouse_parsers .)
add_library(clickhouse_parsers ${LINK_MODE} ${clickhouse_parsers_headers} ${clickhouse_parsers_sources}) add_library(clickhouse_parsers ${LINK_MODE} ${clickhouse_parsers_headers} ${clickhouse_parsers_sources})
target_link_libraries (clickhouse_parsers clickhouse_common_io) target_link_libraries(clickhouse_parsers PUBLIC clickhouse_common_io)
target_include_directories (clickhouse_parsers PUBLIC ${DBMS_INCLUDE_DIR}) target_include_directories(clickhouse_parsers PUBLIC ${DBMS_INCLUDE_DIR})
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory (tests) add_subdirectory(tests)
endif () endif()

15
dbms/src/Parsers/tests/CMakeLists.txt
View File

@ -1,11 +1,10 @@
set(SRCS ) set(SRCS)
add_executable (lexer lexer.cpp ${SRCS}) add_executable(lexer lexer.cpp ${SRCS})
target_link_libraries (lexer clickhouse_parsers) target_link_libraries(lexer PRIVATE clickhouse_parsers)
add_executable (select_parser select_parser.cpp ${SRCS}) add_executable(select_parser select_parser.cpp ${SRCS})
target_link_libraries (select_parser clickhouse_parsers) target_link_libraries(select_parser PRIVATE clickhouse_parsers)
add_executable (create_parser create_parser.cpp ${SRCS})
target_link_libraries (create_parser clickhouse_parsers)
add_executable(create_parser create_parser.cpp ${SRCS})
target_link_libraries(create_parser PRIVATE clickhouse_parsers)

3
dbms/src/Storages/System/CMakeLists.txt
View File

@ -12,5 +12,4 @@ include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_headers_and_sources(storages_system .) add_headers_and_sources(storages_system .)
list (APPEND storages_system_sources ${CONFIG_BUILD}) list (APPEND storages_system_sources ${CONFIG_BUILD})
add_library(clickhouse_storages_system ${LINK_MODE} ${storages_system_headers} ${storages_system_sources}) add_library(clickhouse_storages_system ${LINK_MODE} ${storages_system_headers} ${storages_system_sources})
target_link_libraries(clickhouse_storages_system dbms) target_link_libraries(clickhouse_storages_system PRIVATE dbms common string_utils clickhouse_common_zookeeper)
target_include_directories(clickhouse_storages_system PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

20
dbms/src/Storages/tests/CMakeLists.txt
View File

@ -1,29 +1,29 @@
add_executable (system_numbers system_numbers.cpp) add_executable (system_numbers system_numbers.cpp)
target_link_libraries (system_numbers dbms clickhouse_storages_system) target_link_libraries (system_numbers PRIVATE dbms clickhouse_storages_system clickhouse_common_io)
add_executable (storage_log storage_log.cpp) add_executable (storage_log storage_log.cpp)
target_link_libraries (storage_log dbms) target_link_libraries (storage_log PRIVATE dbms)
add_executable (seek_speed_test seek_speed_test.cpp) add_executable (seek_speed_test seek_speed_test.cpp)
target_link_libraries (seek_speed_test dbms) target_link_libraries (seek_speed_test PRIVATE dbms)
add_executable (part_checker part_checker.cpp) add_executable (part_checker part_checker.cpp)
target_link_libraries (part_checker dbms) target_link_libraries (part_checker PRIVATE dbms)
add_executable (part_name part_name.cpp) add_executable (part_name part_name.cpp)
target_link_libraries (part_name dbms) target_link_libraries (part_name PRIVATE dbms)
add_executable (remove_symlink_directory remove_symlink_directory.cpp) add_executable (remove_symlink_directory remove_symlink_directory.cpp)
target_link_libraries (remove_symlink_directory dbms) target_link_libraries (remove_symlink_directory PRIVATE dbms)
add_executable (merge_selector merge_selector.cpp) add_executable (merge_selector merge_selector.cpp)
target_link_libraries (merge_selector dbms) target_link_libraries (merge_selector PRIVATE dbms)
add_executable (merge_selector2 merge_selector2.cpp) add_executable (merge_selector2 merge_selector2.cpp)
target_link_libraries (merge_selector2 dbms) target_link_libraries (merge_selector2 PRIVATE dbms)
add_executable (get_current_inserts_in_replicated get_current_inserts_in_replicated.cpp) add_executable (get_current_inserts_in_replicated get_current_inserts_in_replicated.cpp)
target_link_libraries (get_current_inserts_in_replicated dbms) target_link_libraries (get_current_inserts_in_replicated PRIVATE dbms clickhouse_common_config clickhouse_common_zookeeper string_utils)
add_executable (get_abandonable_lock_in_all_partitions get_abandonable_lock_in_all_partitions.cpp) add_executable (get_abandonable_lock_in_all_partitions get_abandonable_lock_in_all_partitions.cpp)
target_link_libraries (get_abandonable_lock_in_all_partitions dbms) target_link_libraries (get_abandonable_lock_in_all_partitions PRIVATE dbms clickhouse_common_config clickhouse_common_zookeeper)

2
dbms/src/TableFunctions/CMakeLists.txt
View File

@ -5,4 +5,4 @@ list(REMOVE_ITEM clickhouse_table_functions_sources ITableFunction.cpp TableFunc
list(REMOVE_ITEM clickhouse_table_functions_headers ITableFunction.h TableFunctionFactory.h) list(REMOVE_ITEM clickhouse_table_functions_headers ITableFunction.h TableFunctionFactory.h)
add_library(clickhouse_table_functions ${LINK_MODE} ${clickhouse_table_functions_sources}) add_library(clickhouse_table_functions ${LINK_MODE} ${clickhouse_table_functions_sources})
target_link_libraries(clickhouse_table_functions clickhouse_storages_system dbms ${Poco_Foundation_LIBRARY}) target_link_libraries(clickhouse_table_functions PRIVATE clickhouse_storages_system dbms ${Poco_Foundation_LIBRARY})

12
libs/libcommon/CMakeLists.txt
View File

@ -93,27 +93,31 @@ endif ()
find_package (Threads) find_package (Threads)
target_include_directories (common BEFORE PRIVATE ${CCTZ_INCLUDE_DIR}) target_include_directories (common BEFORE PRIVATE ${CCTZ_INCLUDE_DIR})
target_include_directories (common BEFORE PUBLIC ${CITYHASH_INCLUDE_DIR})
target_include_directories (common PUBLIC ${COMMON_INCLUDE_DIR}) target_include_directories (common PUBLIC ${COMMON_INCLUDE_DIR})
if (NOT USE_INTERNAL_BOOST_LIBRARY) if (NOT USE_INTERNAL_BOOST_LIBRARY)
target_include_directories (common BEFORE PUBLIC ${Boost_INCLUDE_DIRS}) target_include_directories (common BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
endif () endif ()
target_link_libraries ( target_link_libraries (common
common PRIVATE
pocoext pocoext
PUBLIC
${Poco_Foundation_LIBRARY}
${CITYHASH_LIBRARIES} ${CITYHASH_LIBRARIES}
PRIVATE
${CCTZ_LIBRARY} ${CCTZ_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
PUBLIC
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
PRIVATE
${MALLOC_LIBRARIES} ${MALLOC_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${GLIBC_COMPATIBILITY_LIBRARIES} ${GLIBC_COMPATIBILITY_LIBRARIES}
${MEMCPY_LIBRARIES}) ${MEMCPY_LIBRARIES})
if (RT_LIBRARY) if (RT_LIBRARY)
target_link_libraries (common ${RT_LIBRARY}) target_link_libraries (common PRIVATE ${RT_LIBRARY})
endif () endif ()
if (ENABLE_TESTS) if (ENABLE_TESTS)

2
libs/libcommon/cmake/find_jemalloc.cmake
View File

@ -25,7 +25,7 @@ if (ENABLE_JEMALLOC)
if ((NOT JEMALLOC_LIBRARIES OR NOT JEMALLOC_INCLUDE_DIR) AND NOT MISSING_INTERNAL_JEMALLOC_LIBRARY) if ((NOT JEMALLOC_LIBRARIES OR NOT JEMALLOC_INCLUDE_DIR) AND NOT MISSING_INTERNAL_JEMALLOC_LIBRARY)
set (JEMALLOC_LIBRARIES "jemalloc") set (JEMALLOC_LIBRARIES "jemalloc")
set (JEMALLOC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/jemalloc/include") set (JEMALLOC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/jemalloc-cmake/include" "${ClickHouse_SOURCE_DIR}/contrib/jemalloc-cmake/include_linux_x86_64")
set (USE_INTERNAL_JEMALLOC_LIBRARY 1) set (USE_INTERNAL_JEMALLOC_LIBRARY 1)
endif () endif ()

4
libs/libdaemon/CMakeLists.txt
View File

@ -17,10 +17,10 @@ add_library (daemon ${LINK_MODE}
if (USE_UNWIND) if (USE_UNWIND)
target_compile_definitions (daemon PRIVATE USE_UNWIND=1) target_compile_definitions (daemon PRIVATE USE_UNWIND=1)
target_include_directories (daemon BEFORE PRIVATE ${UNWIND_INCLUDE_DIR}) target_include_directories (daemon BEFORE PRIVATE ${UNWIND_INCLUDE_DIR})
target_link_libraries (daemon ${UNWIND_LIBRARY}) target_link_libraries (daemon PRIVATE ${UNWIND_LIBRARY})
endif () endif ()
target_include_directories (daemon PUBLIC include) target_include_directories (daemon PUBLIC include)
target_include_directories (daemon PRIVATE ${ClickHouse_SOURCE_DIR}/libs/libpocoext/include) target_include_directories (daemon PRIVATE ${ClickHouse_SOURCE_DIR}/libs/libpocoext/include)
target_link_libraries (daemon clickhouse_common_io clickhouse_common_config ${Poco_Util_LIBRARY} ${EXECINFO_LIBRARY} ${ELF_LIBRARY}) target_link_libraries (daemon PRIVATE clickhouse_common_io clickhouse_common_config common ${Poco_Net_LIBRARY} ${Poco_Util_LIBRARY} ${EXECINFO_LIBRARY} ${ELF_LIBRARY})

13
libs/libmysqlxx/CMakeLists.txt
View File

@ -42,20 +42,29 @@ else ()
find_library (ICONV_LIBRARY iconv) find_library (ICONV_LIBRARY iconv)
set (MYSQLCLIENT_LIBRARIES ${MYSQLCLIENT_LIBRARIES} ${STATIC_MYSQLCLIENT_LIB} ${ICONV_LIBRARY}) set (MYSQLCLIENT_LIBRARIES ${MYSQLCLIENT_LIBRARIES} ${STATIC_MYSQLCLIENT_LIB} ${ICONV_LIBRARY})
elseif (USE_STATIC_LIBRARIES AND STATIC_MYSQLCLIENT_LIB) elseif (USE_STATIC_LIBRARIES AND STATIC_MYSQLCLIENT_LIB)
if (0)
# old lib patcher (ubuntu trusty?)
set (MYSQLCLIENT_LIB ${CMAKE_CURRENT_BINARY_DIR}/libmysqlclient.a) set (MYSQLCLIENT_LIB ${CMAKE_CURRENT_BINARY_DIR}/libmysqlclient.a)
message(STATUS "will patch mysql lib ${STATIC_MYSQLCLIENT_LIB} => ${MYSQLCLIENT_LIB}")
add_custom_command ( add_custom_command (
OUTPUT ${MYSQLCLIENT_LIB} OUTPUT ${MYSQLCLIENT_LIB}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/patch.sh ${STATIC_MYSQLCLIENT_LIB} ${MYSQLCLIENT_LIB} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/patch.sh ${STATIC_MYSQLCLIENT_LIB} ${MYSQLCLIENT_LIB}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${STATIC_MYSQLCLIENT_LIB}
COMMENT "Patching mysqlclient library.") COMMENT "Patching mysqlclient library.")
add_custom_target (our_mysql_client DEPENDS ${MYSQLCLIENT_LIB}) add_custom_target (our_mysql_client DEPENDS ${MYSQLCLIENT_LIB})
add_dependencies (mysqlxx our_mysql_client) add_dependencies (mysqlxx our_mysql_client)
set (MYSQLCLIENT_LIBRARIES ${MYSQLCLIENT_LIB}) set (MYSQLCLIENT_LIBRARIES ${MYSQLCLIENT_LIB})
else()
set (MYSQLCLIENT_LIBRARIES ${STATIC_MYSQLCLIENT_LIB})
endif()
endif () endif ()
endif () endif ()
target_link_libraries (mysqlxx common ${Poco_Util_LIBRARY} ${MYSQLCLIENT_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_LIBRARIES}) target_link_libraries (mysqlxx common ${Poco_Util_LIBRARY} ${MYSQLCLIENT_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_LIBRARIES})
target_include_directories (mysqlxx SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR}) if (NOT USE_INTERNAL_MYSQL_LIBRARY)
target_include_directories (mysqlxx SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
endif ()
if (ENABLE_TESTS) if (ENABLE_TESTS)
add_subdirectory (src/tests) add_subdirectory (src/tests)

2
utils/check-marks/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (check-marks main.cpp) add_executable (check-marks main.cpp)
target_link_libraries (check-marks clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(check-marks PRIVATE clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})

8
utils/compressor/CMakeLists.txt
View File

@ -1,19 +1,19 @@
find_package (Threads) find_package (Threads)
add_executable (util-clickhouse-compressor main.cpp) add_executable (util-clickhouse-compressor main.cpp)
target_link_libraries (util-clickhouse-compressor clickhouse-compressor-lib) target_link_libraries (util-clickhouse-compressor PRIVATE clickhouse-compressor-lib)
set_target_properties(util-clickhouse-compressor PROPERTIES OUTPUT_NAME "clickhouse-compressor") set_target_properties(util-clickhouse-compressor PROPERTIES OUTPUT_NAME "clickhouse-compressor")
#install (TARGETS util-clickhouse-compressor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse-compressor) #install (TARGETS util-clickhouse-compressor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse-compressor)
add_executable (zstd_test zstd_test.cpp) add_executable (zstd_test zstd_test.cpp)
target_link_libraries (zstd_test ${ZSTD_LIBRARY} common Threads::Threads) target_link_libraries (zstd_test PRIVATE ${ZSTD_LIBRARY} common Threads::Threads)
add_executable (mutator mutator.cpp) add_executable (mutator mutator.cpp)
target_link_libraries (mutator clickhouse_common_io) target_link_libraries(mutator PRIVATE clickhouse_common_io)
add_executable (decompress_perf decompress_perf.cpp) add_executable (decompress_perf decompress_perf.cpp)
target_link_libraries (decompress_perf clickhouse_common_io) target_link_libraries(decompress_perf PRIVATE clickhouse_common_io ${LZ4_LIBRARY})
if (NOT USE_INTERNAL_ZSTD_LIBRARY) if (NOT USE_INTERNAL_ZSTD_LIBRARY)
target_include_directories (zstd_test BEFORE PRIVATE ${ZSTD_INCLUDE_DIR}) target_include_directories (zstd_test BEFORE PRIVATE ${ZSTD_INCLUDE_DIR})

2
utils/config-processor/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_executable (config-processor config-processor.cpp) add_executable (config-processor config-processor.cpp)
target_link_libraries (config-processor clickhouse_common_config) target_link_libraries(config-processor PRIVATE clickhouse_common_config)
INSTALL(TARGETS config-processor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT config-processor) INSTALL(TARGETS config-processor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT config-processor)

5
utils/corrector_utf8/CMakeLists.txt
View File

@ -1,7 +1,6 @@
add_executable(corrector_utf8 corrector_utf8.cpp) add_executable(corrector_utf8 corrector_utf8.cpp)
# Link the executable to the library. # Link the executable to the library.
target_link_libraries (corrector_utf8 clickhouse_common_io) target_link_libraries(corrector_utf8 PRIVATE clickhouse_common_io)
install( TARGETS corrector_utf8 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT corrector_utf8) install(TARGETS corrector_utf8 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT corrector_utf8)

2
utils/fill-factor/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (fill-factor main.cpp) add_executable (fill-factor main.cpp)
target_link_libraries (fill-factor clickhouse_common_io) target_link_libraries(fill-factor PRIVATE clickhouse_common_io)

6
utils/iotest/CMakeLists.txt
View File

@ -1,9 +1,9 @@
add_executable (iotest iotest.cpp ${SRCS}) add_executable (iotest iotest.cpp ${SRCS})
target_link_libraries (iotest clickhouse_common_io) target_link_libraries (iotest PRIVATE clickhouse_common_io)
add_executable (iotest_nonblock iotest_nonblock.cpp ${SRCS}) add_executable (iotest_nonblock iotest_nonblock.cpp ${SRCS})
target_link_libraries (iotest_nonblock clickhouse_common_io) target_link_libraries (iotest_nonblock PRIVATE clickhouse_common_io)
add_executable (iotest_aio iotest_aio.cpp ${SRCS}) add_executable (iotest_aio iotest_aio.cpp ${SRCS})
target_link_libraries (iotest_aio clickhouse_common_io) target_link_libraries (iotest_aio PRIVATE clickhouse_common_io)

4
utils/test-data-generator/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_executable (test-data-generator main.cpp) add_executable (test-data-generator main.cpp)
target_link_libraries (test-data-generator clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(test-data-generator PRIVATE clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
add_executable (markov-model markov-model.cpp) add_executable (markov-model markov-model.cpp)
target_link_libraries (markov-model clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(markov-model PRIVATE clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})

2
utils/wikistat-loader/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (wikistat-loader main.cpp ${SRCS}) add_executable (wikistat-loader main.cpp ${SRCS})
target_link_libraries (wikistat-loader clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (wikistat-loader PRIVATE clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})

2
utils/zookeeper-cli/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_executable(clickhouse-zookeeper-cli zookeeper-cli.cpp) add_executable(clickhouse-zookeeper-cli zookeeper-cli.cpp)
target_link_libraries(clickhouse-zookeeper-cli clickhouse_common_zookeeper ${LINE_EDITING_LIBS}) target_link_libraries(clickhouse-zookeeper-cli PRIVATE clickhouse_common_zookeeper ${LINE_EDITING_LIBS})
if (READLINE_INCLUDE_DIR) if (READLINE_INCLUDE_DIR)
target_include_directories (clickhouse-zookeeper-cli SYSTEM PRIVATE ${READLINE_INCLUDE_DIR}) target_include_directories (clickhouse-zookeeper-cli SYSTEM PRIVATE ${READLINE_INCLUDE_DIR})
endif () endif ()

2
utils/zookeeper-create-entry-to-download-part/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (zookeeper-create-entry-to-download-part main.cpp ${SRCS}) add_executable (zookeeper-create-entry-to-download-part main.cpp ${SRCS})
target_link_libraries (zookeeper-create-entry-to-download-part dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries (zookeeper-create-entry-to-download-part PRIVATE dbms clickhouse_common_zookeeper ${Boost_PROGRAM_OPTIONS_LIBRARY})

2
utils/zookeeper-dump-tree/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (zookeeper-dump-tree main.cpp ${SRCS}) add_executable (zookeeper-dump-tree main.cpp ${SRCS})
target_link_libraries (zookeeper-dump-tree clickhouse_common_zookeeper ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(zookeeper-dump-tree PRIVATE clickhouse_common_zookeeper clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})

2
utils/zookeeper-remove-by-list/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (zookeeper-remove-by-list main.cpp ${SRCS}) add_executable (zookeeper-remove-by-list main.cpp ${SRCS})
target_link_libraries (zookeeper-remove-by-list clickhouse_common_zookeeper ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(zookeeper-remove-by-list PRIVATE clickhouse_common_zookeeper ${Boost_PROGRAM_OPTIONS_LIBRARY})