mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-19 16:20:50 +00:00
Remove unbundled rapidjson support
This commit is contained in:
parent
db468b6fae
commit
133e00a43d
@ -506,7 +506,6 @@ include (cmake/find/s3.cmake)
|
||||
include (cmake/find/blob_storage.cmake)
|
||||
include (cmake/find/base64.cmake)
|
||||
include (cmake/find/fast_float.cmake)
|
||||
include (cmake/find/rapidjson.cmake)
|
||||
include (cmake/find/fastops.cmake)
|
||||
include (cmake/find/odbc.cmake)
|
||||
include (cmake/find/nanodbc.cmake)
|
||||
|
@ -1,35 +0,0 @@
|
||||
option(ENABLE_RAPIDJSON "Use rapidjson" ${ENABLE_LIBRARIES})
|
||||
if(NOT ENABLE_RAPIDJSON)
|
||||
if(USE_INTERNAL_RAPIDJSON_LIBRARY)
|
||||
message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal rapidjson library with ENABLE_RAPIDJSON=OFF")
|
||||
endif()
|
||||
return()
|
||||
endif()
|
||||
|
||||
option(USE_INTERNAL_RAPIDJSON_LIBRARY "Set to FALSE to use system rapidjson library instead of bundled" ON)
|
||||
|
||||
if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/rapidjson/include/rapidjson/rapidjson.h")
|
||||
if(USE_INTERNAL_RAPIDJSON_LIBRARY)
|
||||
message(WARNING "submodule contrib/rapidjson is missing. to fix try run: \n git submodule update --init")
|
||||
message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal rapidjson library")
|
||||
set(USE_INTERNAL_RAPIDJSON_LIBRARY 0)
|
||||
endif()
|
||||
set(MISSING_INTERNAL_RAPIDJSON_LIBRARY 1)
|
||||
endif()
|
||||
|
||||
if(NOT USE_INTERNAL_RAPIDJSON_LIBRARY)
|
||||
find_path(RAPIDJSON_INCLUDE_DIR NAMES rapidjson/rapidjson.h PATHS ${RAPIDJSON_INCLUDE_PATHS})
|
||||
if(NOT RAPIDJSON_INCLUDE_DIR)
|
||||
message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system rapidjson")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(RAPIDJSON_INCLUDE_DIR)
|
||||
set(USE_RAPIDJSON 1)
|
||||
elseif(NOT MISSING_INTERNAL_RAPIDJSON_LIBRARY)
|
||||
set(RAPIDJSON_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rapidjson/include")
|
||||
set(USE_INTERNAL_RAPIDJSON_LIBRARY 1)
|
||||
set(USE_RAPIDJSON 1)
|
||||
endif()
|
||||
|
||||
message(STATUS "Using rapidjson=${USE_RAPIDJSON}: ${RAPIDJSON_INCLUDE_DIR}")
|
11
contrib/rapidjson-cmake/CMakeLists.txt
Normal file
11
contrib/rapidjson-cmake/CMakeLists.txt
Normal file
@ -0,0 +1,11 @@
|
||||
option(ENABLE_RAPIDJSON "Use rapidjson" ${ENABLE_LIBRARIES})
|
||||
|
||||
if(NOT ENABLE_RAPIDJSON)
|
||||
message(STATUS "Not using rapidjson")
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(RAPIDJSON_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rapidjson/include")
|
||||
add_library(_rapidjson INTERFACE)
|
||||
target_include_directories(_rapidjson SYSTEM BEFORE INTERFACE ${RAPIDJSON_INCLUDE_DIR})
|
||||
add_library(ch_contrib::rapidjson ALIAS _rapidjson)
|
@ -508,8 +508,8 @@ if (TARGET ch_contrib::simdjson)
|
||||
dbms_target_link_libraries(PRIVATE ch_contrib::simdjson)
|
||||
endif()
|
||||
|
||||
if(USE_RAPIDJSON)
|
||||
dbms_target_include_directories(SYSTEM PRIVATE ${RAPIDJSON_INCLUDE_DIR})
|
||||
if (TARGET ch_contrib::rapidjson)
|
||||
dbms_target_link_directories(PRIVATE ch_contrib::rapidjson)
|
||||
endif()
|
||||
|
||||
dbms_target_link_libraries(PUBLIC consistent-hashing)
|
||||
|
@ -89,8 +89,8 @@ if (TARGET ch_contrib::simdjson)
|
||||
target_link_libraries(clickhouse_functions PRIVATE ch_contrib::simdjson)
|
||||
endif()
|
||||
|
||||
if(USE_RAPIDJSON)
|
||||
target_include_directories(clickhouse_functions SYSTEM PRIVATE ${RAPIDJSON_INCLUDE_DIR})
|
||||
if (TARGET ch_contrib::rapidjson)
|
||||
target_link_libraries(clickhouse_functions PRIVATE ch_contrib::rapidjson)
|
||||
endif()
|
||||
|
||||
# ClickHouse developers may use platform-dependent code under some macro (e.g. `#ifdef ENABLE_MULTITARGET`).
|
||||
|
@ -37,3 +37,6 @@ endif()
|
||||
if (TARGET ch_contrib::simdjson)
|
||||
set(USE_SIMDJSON 1)
|
||||
endif()
|
||||
if (TARGET ch_contrib::rapidjson)
|
||||
set(USE_RAPIDJSON 1)
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user