thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
kssenii 2021-07-09 14:22:53 +00:00
parent 750f9b82fb
commit 46e9e21419
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/test/fasttest/run.sh
View File

@ -378,6 +378,8 @@ function run_tests
# needs pv
01923_network_receive_time_metric_insert
01889_sqlite_read_write
)
time clickhouse-test --hung-check -j 8 --order=random --use-skip-list \

10
src/CMakeLists.txt
View File

@ -76,7 +76,9 @@ add_headers_and_sources(clickhouse_common_io IO)
add_headers_and_sources(clickhouse_common_io IO/S3)
list (REMOVE_ITEM clickhouse_common_io_sources Common/malloc.cpp Common/new_delete.cpp)
add_headers_and_sources(dbms Databases/SQLite)
if (USE_SQLITE)
add_headers_and_sources(dbms Databases/SQLite)
endif()
if(USE_RDKAFKA)
add_headers_and_sources(dbms Storages/Kafka)
@ -427,6 +429,10 @@ if (USE_AMQPCPP)
dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${AMQPCPP_INCLUDE_DIR})
endif()
if (USE_SQLITE)
dbms_target_link_libraries(PUBLIC sqlite)
endif()
if (USE_CASSANDRA)
dbms_target_link_libraries(PUBLIC ${CASSANDRA_LIBRARY})
dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${CASS_INCLUDE_DIR})
@ -462,8 +468,6 @@ endif ()
dbms_target_link_libraries(PRIVATE _boost_context)
dbms_target_link_libraries(PUBLIC sqlite)
include ("${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake")
if (ENABLE_TESTS AND USE_GTEST)

8
src/Storages/registerStorages.cpp
View File

@ -27,7 +27,6 @@ void registerStorageView(StorageFactory & factory);
void registerStorageMaterializedView(StorageFactory & factory);
void registerStorageLiveView(StorageFactory & factory);
void registerStorageGenerateRandom(StorageFactory & factory);
void registerStorageSQLite(StorageFactory & factory);
#if USE_AWS_S3
void registerStorageS3(StorageFactory & factory);
@ -69,9 +68,10 @@ void registerStorageExternalDistributed(StorageFactory & factory);
#endif
#if USE_SQLITE
registerStorageSQLite(factory);
void registerStorageSQLite(StorageFactory & factory);
#endif
void registerStorages()
{
auto & factory = StorageFactory::instance();
@ -133,6 +133,10 @@ void registerStorages()
#if USE_MYSQL || USE_LIBPQXX
registerStorageExternalDistributed(factory);
#endif
#if USE_SQLITE
registerStorageSQLite(factory);
#endif
}
}