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

Remove unbundled yaml-cpp support

Browse Source
This commit is contained in:
Azat Khuzhin 2022-01-18 00:23:14 +03:00
parent dea90967cf
commit 592bc1e97d
6 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -497,7 +497,6 @@ include (cmake/find/miniselect.cmake)
include (cmake/find/curl.cmake) include (cmake/find/curl.cmake)
include (cmake/find/s3.cmake) include (cmake/find/s3.cmake)
include (cmake/find/libpqxx.cmake) include (cmake/find/libpqxx.cmake)
include (cmake/find/yaml-cpp.cmake)
include (cmake/find/nlp.cmake) include (cmake/find/nlp.cmake)
include (cmake/find/filelog.cmake) include (cmake/find/filelog.cmake)
include (cmake/find/sentry.cmake) include (cmake/find/sentry.cmake)

9
cmake/find/yaml-cpp.cmake
View File

@ -1,9 +0,0 @@
option(USE_YAML_CPP "Enable yaml-cpp" ${ENABLE_LIBRARIES})
if (NOT USE_YAML_CPP)
return()
endif()
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/yaml-cpp/README.md")
message (ERROR "submodule contrib/yaml-cpp is missing. to fix try run: \n git submodule update --init")
endif()

6
contrib/CMakeLists.txt vendored
View File

@ -39,11 +39,7 @@ add_subdirectory (replxx-cmake)
add_subdirectory (unixodbc-cmake) add_subdirectory (unixodbc-cmake)
add_subdirectory (nanodbc-cmake) add_subdirectory (nanodbc-cmake)
add_subdirectory (capnproto-cmake) add_subdirectory (capnproto-cmake)
add_subdirectory (yaml-cpp-cmake)
if (USE_YAML_CPP)
add_subdirectory (yaml-cpp-cmake)
endif()
add_subdirectory (re2-cmake) add_subdirectory (re2-cmake)
add_subdirectory (xz-cmake) add_subdirectory (xz-cmake)
add_subdirectory (brotli-cmake) add_subdirectory (brotli-cmake)

68
contrib/yaml-cpp-cmake/CMakeLists.txt
View File

@ -1,39 +1,47 @@
option(ENABLE_YAML_CPP "Enable yaml-cpp" ${ENABLE_LIBRARIES})
if (NOT ENABLE_YAML_CPP)
message(STATUS "Not using yaml")
return()
endif()
set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/yaml-cpp) set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/yaml-cpp)
set (SRCS set (SRCS
${LIBRARY_DIR}/src/binary.cpp ${LIBRARY_DIR}/src/binary.cpp
${LIBRARY_DIR}/src/emitterutils.cpp ${LIBRARY_DIR}/src/emitterutils.cpp
${LIBRARY_DIR}/src/null.cpp ${LIBRARY_DIR}/src/null.cpp
${LIBRARY_DIR}/src/scantoken.cpp ${LIBRARY_DIR}/src/scantoken.cpp
${LIBRARY_DIR}/src/convert.cpp ${LIBRARY_DIR}/src/convert.cpp
${LIBRARY_DIR}/src/exceptions.cpp ${LIBRARY_DIR}/src/exceptions.cpp
${LIBRARY_DIR}/src/ostream_wrapper.cpp ${LIBRARY_DIR}/src/ostream_wrapper.cpp
${LIBRARY_DIR}/src/simplekey.cpp ${LIBRARY_DIR}/src/simplekey.cpp
${LIBRARY_DIR}/src/depthguard.cpp ${LIBRARY_DIR}/src/depthguard.cpp
${LIBRARY_DIR}/src/exp.cpp ${LIBRARY_DIR}/src/exp.cpp
${LIBRARY_DIR}/src/parse.cpp ${LIBRARY_DIR}/src/parse.cpp
${LIBRARY_DIR}/src/singledocparser.cpp ${LIBRARY_DIR}/src/singledocparser.cpp
${LIBRARY_DIR}/src/directives.cpp ${LIBRARY_DIR}/src/directives.cpp
${LIBRARY_DIR}/src/memory.cpp ${LIBRARY_DIR}/src/memory.cpp
${LIBRARY_DIR}/src/parser.cpp ${LIBRARY_DIR}/src/parser.cpp
${LIBRARY_DIR}/src/stream.cpp ${LIBRARY_DIR}/src/stream.cpp
${LIBRARY_DIR}/src/emit.cpp ${LIBRARY_DIR}/src/emit.cpp
${LIBRARY_DIR}/src/nodebuilder.cpp ${LIBRARY_DIR}/src/nodebuilder.cpp
${LIBRARY_DIR}/src/regex_yaml.cpp ${LIBRARY_DIR}/src/regex_yaml.cpp
${LIBRARY_DIR}/src/tag.cpp ${LIBRARY_DIR}/src/tag.cpp
${LIBRARY_DIR}/src/emitfromevents.cpp ${LIBRARY_DIR}/src/emitfromevents.cpp
${LIBRARY_DIR}/src/node.cpp ${LIBRARY_DIR}/src/node.cpp
${LIBRARY_DIR}/src/scanner.cpp ${LIBRARY_DIR}/src/scanner.cpp
${LIBRARY_DIR}/src/emitter.cpp ${LIBRARY_DIR}/src/emitter.cpp
${LIBRARY_DIR}/src/node_data.cpp ${LIBRARY_DIR}/src/node_data.cpp
${LIBRARY_DIR}/src/scanscalar.cpp ${LIBRARY_DIR}/src/scanscalar.cpp
${LIBRARY_DIR}/src/emitterstate.cpp ${LIBRARY_DIR}/src/emitterstate.cpp
${LIBRARY_DIR}/src/nodeevents.cpp ${LIBRARY_DIR}/src/nodeevents.cpp
${LIBRARY_DIR}/src/scantag.cpp ${LIBRARY_DIR}/src/scantag.cpp
) )
add_library (yaml-cpp ${SRCS}) add_library (yaml-cpp ${SRCS})
target_include_directories(yaml-cpp PRIVATE ${LIBRARY_DIR}/include/yaml-cpp) target_include_directories(yaml-cpp PRIVATE ${LIBRARY_DIR}/include/yaml-cpp)
target_include_directories(yaml-cpp SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include) target_include_directories(yaml-cpp SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)
add_library (ch_contrib::yaml_cpp ALIAS yaml-cpp)

6
src/Common/Config/CMakeLists.txt
View File

@ -27,7 +27,7 @@ target_link_libraries(clickhouse_common_config_no_zookeeper_log
string_utils string_utils
) )
if (USE_YAML_CPP) if (TARGET ch_contrib::yaml_cpp)
target_link_libraries(clickhouse_common_config PRIVATE yaml-cpp) target_link_libraries(clickhouse_common_config PRIVATE ch_contrib::yaml_cpp)
target_link_libraries(clickhouse_common_config_no_zookeeper_log PRIVATE yaml-cpp) target_link_libraries(clickhouse_common_config_no_zookeeper_log PRIVATE ch_contrib::yaml_cpp)
endif() endif()

3
src/configure_config.cmake
View File

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