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

Remove unbundled sqlite support

Browse Source
This commit is contained in:
Azat Khuzhin 2022-01-17 23:53:49 +03:00
parent 126aa4b65c
commit cb1abf5307
6 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -503,7 +503,6 @@ include (cmake/find/fast_float.cmake)
include (cmake/find/fastops.cmake)
include (cmake/find/odbc.cmake)
include (cmake/find/nanodbc.cmake)
include (cmake/find/sqlite.cmake)
include (cmake/find/libpqxx.cmake)
include (cmake/find/yaml-cpp.cmake)
include (cmake/find/nlp.cmake)

16
cmake/find/sqlite.cmake
View File

@ -1,16 +0,0 @@
option(ENABLE_SQLITE "Enable sqlite" ${ENABLE_LIBRARIES})
if (NOT ENABLE_SQLITE)
return()
endif()
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/sqlite-amalgamation/sqlite3.c")
message (WARNING "submodule contrib/sqlite3-amalgamation is missing. to fix try run: \n git submodule update --init")
message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal sqlite library")
set (USE_SQLITE 0)
return()
endif()
set (USE_SQLITE 1)
set (SQLITE_LIBRARY sqlite)
message (STATUS "Using sqlite=${USE_SQLITE}")

4
contrib/CMakeLists.txt vendored
View File

@ -180,9 +180,7 @@ if (USE_NLP)
add_subdirectory(lemmagen-c-cmake)
endif()
if (USE_SQLITE)
add_subdirectory(sqlite-cmake)
endif()
add_subdirectory (sqlite-cmake)
if (USE_S2_GEOMETRY)
add_subdirectory(s2geometry-cmake)

8
contrib/sqlite-cmake/CMakeLists.txt
View File

@ -1,6 +1,14 @@
option(ENABLE_SQLITE "Enable sqlite" ${ENABLE_LIBRARIES})
if (NOT ENABLE_SQLITE)
message(STATUS "Not using sqlite")
return()
endif()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/sqlite-amalgamation")
set(SRCS ${LIBRARY_DIR}/sqlite3.c)
add_library(sqlite ${SRCS})
target_include_directories(sqlite SYSTEM PUBLIC "${LIBRARY_DIR}")
add_library(ch_contrib::sqlite ALIAS sqlite)

6
src/CMakeLists.txt
View File

@ -83,7 +83,7 @@ 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 Disks/IO)
if (USE_SQLITE)
if (TARGET ch_contrib::sqlite)
add_headers_and_sources(dbms Databases/SQLite)
endif()
@ -459,8 +459,8 @@ if (TARGET ch_contrib::amqp_cpp)
dbms_target_link_libraries(PUBLIC ch_contrib::amqp_cpp)
endif()
if (USE_SQLITE)
dbms_target_link_libraries(PUBLIC sqlite)
if (TARGET ch_contrib::sqlite)
dbms_target_link_libraries(PUBLIC ch_contrib::sqlite)
endif()
if (USE_CASSANDRA)

3
src/configure_config.cmake
View File

@ -52,3 +52,6 @@ endif()
if (TARGET ch_contrib::base64)
set(USE_BASE64 1)
endif()
if (TARGET ch_contrib::sqlite)
set(USE_SQLITE 1)
endif()