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

link Storages/System via lib

Browse Source
This commit is contained in:
proller 2017-03-15 21:54:31 +03:00 committed by alexey-milovidov
parent 25caed0c03
commit d777cab172
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/dbms_glob_sources.cmake
View File

@ -11,3 +11,7 @@ endmacro()
macro(add_headers_only prefix common_path) macro(add_headers_only prefix common_path)
add_glob(${prefix}_headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/DB/${common_path}/*.h src/${common_path}/*.h) add_glob(${prefix}_headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/DB/${common_path}/*.h src/${common_path}/*.h)
endmacro() endmacro()
macro(add_path_sources prefix common_path)
add_glob(${prefix}_sources ${common_path}/*.cpp)
endmacro()

1
dbms/CMakeLists.txt
View File

@ -47,7 +47,6 @@ add_headers_and_sources(dbms Columns)
add_headers_and_sources(dbms Storages) add_headers_and_sources(dbms Storages)
add_headers_and_sources(dbms Storages/Distributed) add_headers_and_sources(dbms Storages/Distributed)
add_headers_and_sources(dbms Storages/MergeTree) add_headers_and_sources(dbms Storages/MergeTree)
add_headers_and_sources(dbms Storages/System)
add_headers_and_sources(dbms Core) add_headers_and_sources(dbms Core)
add_headers_and_sources(dbms Client) add_headers_and_sources(dbms Client)
add_headers_only(dbms Server) add_headers_only(dbms Server)

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

@ -8,7 +8,7 @@ add_library(clickhouse-server
StatusFile.cpp StatusFile.cpp
ReplicasStatusHandler.cpp ReplicasStatusHandler.cpp
) )
target_link_libraries(clickhouse-server daemon) target_link_libraries(clickhouse-server daemon storages_system)
add_library(clickhouse-local LocalServer.cpp) add_library(clickhouse-local LocalServer.cpp)
target_link_libraries(clickhouse-local dbms) target_link_libraries(clickhouse-local dbms)

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

@ -1,3 +1,5 @@
add_subdirectory (System)
if (ENABLE_TESTS) if (ENABLE_TESTS)
add_subdirectory (tests) add_subdirectory (tests)
endif (ENABLE_TESTS) endif (ENABLE_TESTS)

4
dbms/src/Storages/System/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_path_sources(storages_system .)
add_library(storages_system ${storages_system_sources})