thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34823 from azat/fix-build_options

Browse Source 
Fix generating system.build_options
This commit is contained in:
Maksim Kita 2022-03-04 19:17:24 +01:00 committed by GitHub
commit c037adb060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Formats/CMakeLists.txt
View File

@ -1,21 +1,2 @@
if (TARGET ch_contrib::avrocpp)
set(USE_AVRO 1)
endif()
if (TARGET ch_contrib::parquet)
set(USE_PARQUET 1)
set(USE_ARROW 1)
set(USE_ORC 1)
endif()
if (TARGET ch_contrib::snappy)
set(USE_SNAPPY 1)
endif()
if (TARGET ch_contrib::protobuf)
set(USE_PROTOBUF 1)
endif()
if (TARGET ch_contrib::msgpack)
set(USE_MSGPACK 1)
endif()
if (TARGET ch_contrib::capnp)
set(USE_CAPNP 1)
endif()
include(configure_config.cmake)
configure_file(config_formats.h.in ${ConfigIncludePath}/config_formats.h)

20
src/Formats/configure_config.cmake Normal file
View File

@ -0,0 +1,20 @@
if (TARGET ch_contrib::avrocpp)
set(USE_AVRO 1)
endif()
if (TARGET ch_contrib::parquet)
set(USE_PARQUET 1)
set(USE_ARROW 1)
set(USE_ORC 1)
endif()
if (TARGET ch_contrib::snappy)
set(USE_SNAPPY 1)
endif()
if (TARGET ch_contrib::protobuf)
set(USE_PROTOBUF 1)
endif()
if (TARGET ch_contrib::msgpack)
set(USE_MSGPACK 1)
endif()
if (TARGET ch_contrib::capnp)
set(USE_CAPNP 1)
endif()

8
src/Storages/System/CMakeLists.txt
View File

@ -39,7 +39,13 @@ if(Git_FOUND)
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
configure_file (StorageSystemBuildOptions.generated.cpp.in ${CONFIG_BUILD})
function(generate_system_build_options)
include(${ClickHouse_SOURCE_DIR}/src/configure_config.cmake)
include(${ClickHouse_SOURCE_DIR}/src/Functions/configure_config.cmake)
include(${ClickHouse_SOURCE_DIR}/src/Formats/configure_config.cmake)
configure_file(StorageSystemBuildOptions.generated.cpp.in ${CONFIG_BUILD})
endfunction()
generate_system_build_options()
include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
add_headers_and_sources(storages_system .)

3
src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
View File

@ -11,7 +11,6 @@ const char * auto_config_build[]
"VERSION_DATE", "@VERSION_DATE@",
"BUILD_TYPE", "@CMAKE_BUILD_TYPE@",
"SYSTEM_PROCESSOR", "@CMAKE_SYSTEM_PROCESSOR@",
"LIBRARY_ARCHITECTURE", "@CMAKE_LIBRARY_ARCHITECTURE@",
"CMAKE_VERSION", "@CMAKE_VERSION@",
"C_COMPILER", "@CMAKE_C_COMPILER@",
"C_COMPILER_VERSION", "@CMAKE_C_COMPILER_VERSION@",
@ -19,7 +18,7 @@ const char * auto_config_build[]
"CXX_COMPILER_VERSION", "@CMAKE_CXX_COMPILER_VERSION@",
"C_FLAGS", "@FULL_C_FLAGS_NORMALIZED@",
"CXX_FLAGS", "@FULL_CXX_FLAGS_NORMALIZED@",
"LINK_FLAGS", "@CMAKE_EXE_LINKER_FLAGS_NORMALIZED@",
"LINK_FLAGS", "@FULL_EXE_LINKER_FLAGS_NORMALIZED@",
"BUILD_COMPILE_DEFINITIONS", "@BUILD_COMPILE_DEFINITIONS@",
"STATIC", "@USE_STATIC_LIBRARIES@",
"SPLIT_BINARY", "@CLICKHOUSE_SPLIT_BINARY@",