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

Simplify a bit

Browse Source
This commit is contained in:
Robert Schulze 2022-09-27 07:29:18 +00:00
parent 99725e68d1
commit 588a5e5a42
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
6 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/keeper/CMakeLists.txt
View File

@ -33,7 +33,7 @@ install(FILES keeper_config.xml DESTINATION "${CLICKHOUSE_ETC_DIR}/clickhouse-ke
add_dependencies(clickhouse-keeper-lib clickhouse_keeper_configs)
if (BUILD_STANDALONE_KEEPER)
# Sraight list of all required sources
# Straight list of all required sources
set(CLICKHOUSE_KEEPER_STANDALONE_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/ACLMap.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/Changelog.cpp

5
src/Daemon/CMakeLists.txt
View File

@ -1,11 +1,10 @@
set (GENERATED_GIT_HASH_CPP "${CMAKE_CURRENT_BINARY_DIR}/GitHash.generated.cpp")
configure_file(GitHash.generated.cpp.in ${GENERATED_GIT_HASH_CPP})
configure_file(GitHash.cpp.in GitHash.generated.cpp)
add_library (daemon
BaseDaemon.cpp
GraphiteWriter.cpp
SentryWriter.cpp
${GENERATED_GIT_HASH_CPP}
GitHash.generated.cpp
)
if (OS_DARWIN AND NOT USE_STATIC_LIBRARIES)

8
src/Daemon/GitHash.cpp.in Normal file
View File

@ -0,0 +1,8 @@
// File was generated by CMake
#include <base/types.h>
String getGitHash()
{
return "@GIT_HASH@";
}

10
src/Daemon/GitHash.generated.cpp.in
View File

@ -1,10 +0,0 @@
// .cpp autogenerated by cmake
#include <base/types.h>
static const String GIT_HASH = "@GIT_HASH@";
String getGitHash()
{
return GIT_HASH;
}

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

@ -2,8 +2,6 @@
# You can also regenerate it manually this way:
# execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/StorageSystemContributors.sh")
set (CONFIG_BUILD "${CMAKE_CURRENT_BINARY_DIR}/StorageSystemBuildOptions.generated.cpp")
get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
get_property(TZDATA_VERSION GLOBAL PROPERTY TZDATA_VERSION_PROP)
@ -11,14 +9,14 @@ 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})
configure_file(StorageSystemBuildOptions.cpp.in StorageSystemBuildOptions.generated.cpp)
endfunction()
generate_system_build_options()
include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
add_headers_and_sources(storages_system .)
list (APPEND storages_system_sources ${CONFIG_BUILD})
list (APPEND storages_system_sources StorageSystemBuildOptions.generated.cpp)
add_custom_target(generate-contributors
./StorageSystemContributors.sh

2
src/Storages/System/StorageSystemBuildOptions.generated.cpp.in → src/Storages/System/StorageSystemBuildOptions.cpp.in
View File

@ -1,4 +1,4 @@
// .cpp autogenerated by cmake
// File was generated by CMake
const char * auto_config_build[]
{