Generate config.h into ${CONFIG_INCLUDE_PATH}

This makes the target location consistent with other auto-generated
files like config_formats.h, config_core.h, and config_functions.h and
simplifies the build of clickhouse_common.
This commit is contained in:
Robert Schulze 2022-09-28 08:45:15 +00:00
parent 06507c40de
commit 78fc36ca49
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
162 changed files with 163 additions and 165 deletions

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_ODBC

View File

@ -2,7 +2,7 @@
#include <Interpreters/Context.h>
#include <Server/HTTP/HTTPRequestHandler.h>
#include <Common/config.h>
#include "config.h"
#include <Poco/Logger.h>
#if USE_ODBC

View File

@ -20,7 +20,7 @@
#include <Common/BridgeProtocolVersion.h>
#include <Common/logger_useful.h>
#include <Server/HTTP/HTMLForm.h>
#include <Common/config.h>
#include "config.h"
#include <mutex>
#include <memory>

View File

@ -1,7 +1,7 @@
#include "ODBCHandlerFactory.h"
#include "PingHandler.h"
#include "ColumnInfoHandler.h"
#include <Common/config.h>
#include "config.h"
#include <Poco/URI.h>
#include <Poco/Net/HTTPServerRequest.h>
#include <Common/logger_useful.h>

View File

@ -2,7 +2,7 @@
#include <Interpreters/Context.h>
#include <Server/HTTP/HTTPRequestHandler.h>
#include <Common/config.h>
#include "config.h"
#include <Poco/Logger.h>
#if USE_ODBC

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_ODBC

View File

@ -11,7 +11,7 @@
#include <AggregateFunctions/AggregateFunctionSum.h>
#include <Core/DecimalFunctions.h>
#include <Common/config.h>
#include "config.h"
#if USE_EMBEDDED_COMPILER
# include <llvm/IR/IRBuilder.h>

View File

@ -9,7 +9,7 @@
#include <AggregateFunctions/IAggregateFunction.h>
#include <Common/config.h>
#include "config.h"
#if USE_EMBEDDED_COMPILER
# include <llvm/IR/IRBuilder.h>

View File

@ -12,7 +12,7 @@
#include <AggregateFunctions/AggregateFunctionFactory.h>
#include <Common/assert_cast.h>
#include <Common/config.h>
#include "config.h"
#if USE_EMBEDDED_COMPILER
# include <llvm/IR/IRBuilder.h>

View File

@ -5,7 +5,7 @@
#include <Common/assert_cast.h>
#include <AggregateFunctions/IAggregateFunction.h>
#include <Common/config.h>
#include "config.h"
#if USE_EMBEDDED_COMPILER
# include <llvm/IR/IRBuilder.h>

View File

@ -14,7 +14,7 @@
#include <DataTypes/DataTypeNullable.h>
#include <AggregateFunctions/IAggregateFunction.h>
#include <Common/config.h>
#include "config.h"
#if USE_EMBEDDED_COMPILER
# include <llvm/IR/IRBuilder.h>

View File

@ -10,7 +10,7 @@
#include <IO/ReadHelpers.h>
#include <IO/WriteHelpers.h>
#include <Common/config.h>
#include "config.h"
#if USE_EMBEDDED_COMPILER
# include <llvm/IR/IRBuilder.h>

View File

@ -13,7 +13,7 @@
#include <AggregateFunctions/IAggregateFunction.h>
#include <Common/config.h>
#include "config.h"
#include <Common/TargetSpecific.h>
#if USE_EMBEDDED_COMPILER

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_DATASKETCHES

View File

@ -8,7 +8,7 @@
#include <Common/StringUtils/StringUtils.h>
#include <Common/SensitiveDataMasker.h>
#include <Common/config.h>
#include "config.h"
#include <Common/logger_useful.h>
#include <base/errnoToString.h>
#include <IO/ReadHelpers.h>

View File

@ -16,7 +16,7 @@
#include <base/range.h>
#include <BridgeHelper/IBridgeHelper.h>
#include <Common/config.h>
#include "config.h"
namespace DB

View File

@ -19,12 +19,11 @@ endif()
include(../cmake/limit_jobs.cmake)
set (CONFIG_VERSION "${CMAKE_CURRENT_BINARY_DIR}/Common/config_version.h")
set (CONFIG_COMMON "${CMAKE_CURRENT_BINARY_DIR}/Common/config.h")
include (../cmake/version.cmake)
message (STATUS "Will build ${VERSION_FULL} revision ${VERSION_REVISION} ${VERSION_OFFICIAL}")
include (configure_config.cmake)
configure_file (Common/config.h.in ${CONFIG_COMMON})
configure_file (Common/config.h.in ${CONFIG_INCLUDE_PATH}/config.h)
configure_file (Common/config_version.h.in ${CONFIG_VERSION})
configure_file (Core/config_core.h.in "${CMAKE_CURRENT_BINARY_DIR}/Core/include/config_core.h")
@ -153,7 +152,7 @@ else()
endif ()
list (APPEND clickhouse_common_io_sources ${CONFIG_BUILD})
list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON})
list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION})
list (APPEND dbms_sources Functions/IFunction.cpp Functions/FunctionFactory.cpp Functions/FunctionHelpers.cpp Functions/extractTimeZoneFromFunctionArguments.cpp Functions/FunctionsLogical.cpp Functions/indexHint.cpp)
list (APPEND dbms_headers Functions/IFunction.h Functions/FunctionFactory.h Functions/FunctionHelpers.h Functions/extractTimeZoneFromFunctionArguments.h Functions/FunctionsLogical.h Functions/indexHint.h)

View File

@ -17,7 +17,7 @@
#include <Common/getNumberOfPhysicalCPUCores.h>
#include <Common/tests/gtest_global_context.h>
#include <Common/typeid_cast.h>
#include <Common/config.h>
#include "config.h"
#include <Columns/ColumnString.h>
#include <Columns/ColumnsNumber.h>
#include <Core/Block.h>

View File

@ -1,7 +1,7 @@
#pragma once
#include <Core/Types.h>
#include <Common/config.h>
#include "config.h"
#if USE_REPLXX
# include <base/ReplxxLineReader.h>

View File

@ -34,7 +34,7 @@
#include <base/scope_guard.h>
#include <Common/config_version.h>
#include <Common/config.h>
#include "config.h"
#if USE_SSL
# include <Poco/Net/SecureStreamSocket.h>

View File

@ -4,7 +4,7 @@
#include <Poco/Net/StreamSocket.h>
#include <Common/config.h>
#include "config.h"
#include <Client/IServerConnection.h>
#include <Core/Defines.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#include "ConfigProcessor.h"
#include "YAMLParser.h"

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <string>
#include <unordered_set>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_YAML_CPP
#include "YAMLParser.h"

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <string>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_SSL
#include "OpenSSLHelpers.h"

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_SSL
# include <base/types.h>

View File

@ -5,9 +5,8 @@
#include <memory>
#include <optional>
#include <Common/StringSearcher.h>
#include "config.h"
#include <re2/re2.h>
#include <Common/config.h>
#include <re2_st/re2.h>

View File

@ -5,7 +5,7 @@
#include <signal.h>
#include <time.h>
#include <Common/config.h>
#include "config.h"
namespace Poco

View File

@ -14,7 +14,7 @@
#include <unordered_map>
#include <map>
#include <Common/config.h>
#include "config.h"
#if USE_UNWIND
# include <libunwind.h>

View File

@ -13,7 +13,7 @@
#include <IO/WriteBufferFromString.h>
#include <base/getThreadId.h>
#include <Common/config.h>
#include "config.h"
#if USE_SSL
# include <Poco/Net/SecureStreamSocket.h>

View File

@ -1,6 +1,6 @@
#include "getNumberOfPhysicalCPUCores.h"
#include <Common/config.h>
#include "config.h"
#if defined(OS_LINUX)
# include <cmath>
# include <fstream>

View File

@ -7,7 +7,7 @@
#include <Common/Concepts.h>
#include <Common/CurrentMemoryTracker.h>
#include <Common/config.h>
#include "config.h"
#if USE_JEMALLOC
# include <jemalloc/jemalloc.h>

View File

@ -1,6 +1,6 @@
#include <cassert>
#include <new>
#include <Common/config.h>
#include "config.h"
#include <Common/memory.h>
#if defined(OS_DARWIN) && (USE_JEMALLOC)

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_YAML_CPP
#include "gtest_helper_functions.h"

View File

@ -1,5 +1,5 @@
#include <string_view>
#include <Common/config.h>
#include "config.h"
#include <Common/Exception.h>
#include <base/types.h>
#include <IO/VarInt.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include "config_core.h"
#if USE_NURAFT

View File

@ -16,7 +16,7 @@
#include <Common/hex.h>
#include "Common/config_version.h"
#include <Common/config.h>
#include "config.h"
#if USE_SENTRY && !defined(KEEPER_STANDALONE_BUILD)

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_CASSANDRA
#include <cassandra.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_CASSANDRA

View File

@ -17,7 +17,7 @@
#include <Common/escapeForFileName.h>
#include <QueryPipeline/QueryPipeline.h>
#include <Processors/Formats/IInputFormat.h>
#include <Common/config.h>
#include "config.h"
namespace DB

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_SSL
#include <Disks/IDisk.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <IO/ReadBufferFromFile.h>
#include <IO/AsynchronousReader.h>
#include <utility>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_AZURE_BLOB_STORAGE

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AZURE_BLOB_STORAGE

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <IO/ReadBufferFromFile.h>
#include <IO/ReadSettings.h>
#include <IO/AsynchronousReader.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <IO/ReadBufferFromFile.h>
#include <utility>

View File

@ -6,7 +6,7 @@
#include <Common/Stopwatch.h>
#include <Common/assert_cast.h>
#include <Common/CurrentThread.h>
#include <Common/config.h>
#include "config.h"
#include <IO/SeekableReadBuffer.h>
#include <future>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_AZURE_BLOB_STORAGE

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AZURE_BLOB_STORAGE

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <IO/WriteBufferFromFile.h>
#include <IO/WriteBufferFromFileDecorator.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AZURE_BLOB_STORAGE

View File

@ -1,5 +1,5 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AZURE_BLOB_STORAGE

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#include <Disks/DiskFactory.h>

View File

@ -1,5 +1,5 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_HDFS

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <Disks/ObjectStorages/IObjectStorage.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#include <Common/logger_useful.h>
#include <IO/ReadHelpers.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <Disks/ObjectStorages/IObjectStorage.h>

View File

@ -2,7 +2,7 @@
#include "DiskFactory.h"
#include <Common/config.h>
#include "config.h"
namespace DB
{

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#include <Formats/FormatFactory.h>

View File

@ -7,7 +7,7 @@
#include <DataTypes/NumberTraits.h>
#include "config_core.h"
#include <Common/config.h>
#include "config.h"
namespace DB

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <hashids.h>

View File

@ -3,7 +3,7 @@
#include <Functions/IFunction.h>
#include <DataTypes/Native.h>
#include <Common/config.h>
#include "config.h"
namespace DB
{

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#include <Columns/ColumnMap.h>
#include <Columns/ColumnArray.h>

View File

@ -12,7 +12,7 @@
#include <Functions/IsOperation.h>
#include <Functions/castTypeToEither.h>
#include <Common/config.h>
#include "config.h"
#include <Common/TargetSpecific.h>
#if USE_EMBEDDED_COMPILER

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_SSL
#include <DataTypes/DataTypeString.h>

View File

@ -18,7 +18,7 @@
#include <Common/typeid_cast.h>
#include <Core/Defines.h>
#include <Common/config.h>
#include "config.h"
namespace DB

View File

@ -17,7 +17,7 @@
#include <cstdlib>
#include <memory>
#include <Common/config.h>
#include "config.h"
#if USE_EMBEDDED_COMPILER
# pragma GCC diagnostic push

View File

@ -8,7 +8,7 @@
#include "Regexps.h"
#include "config_functions.h"
#include <Common/config.h>
#include "config.h"
#include <re2_st/re2.h>

View File

@ -9,7 +9,7 @@
#include "Regexps.h"
#include "config_functions.h"
#include <Common/config.h>
#include "config.h"
#if USE_VECTORSCAN
# include <hs.h>

View File

@ -8,7 +8,7 @@
#include "Regexps.h"
#include "config_functions.h"
#include <Common/config.h>
#include "config.h"
#if USE_VECTORSCAN
# include <hs.h>

View File

@ -11,7 +11,7 @@
#include <Common/Exception.h>
#include <Common/OptimizedRegularExpression.h>
#include <Common/ProfileEvents.h>
#include <Common/config.h>
#include "config.h"
#include <base/defines.h>
#include <base/StringRef.h>
#include <boost/container_hash/hash.hpp>

View File

@ -6,7 +6,7 @@
#include <IO/WriteHelpers.h>
#include "config_functions.h"
#include <Common/config.h>
#include "config.h"
#include <re2_st/re2.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_DATASKETCHES

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_SSL

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_SSL

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_SSL

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_SSL

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_MINIZIP
#include <IO/Archives/IArchiveReader.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_MINIZIP
#include <IO/Archives/IArchiveWriter.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_BROTLI
# include <brotli/decode.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_BROTLI
# include <IO/BrotliWriteBuffer.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_BZIP2
# include <IO/Bzip2ReadBuffer.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_BZIP2
# include <IO/Bzip2WriteBuffer.h>

View File

@ -16,7 +16,7 @@
#include <IO/Bzip2WriteBuffer.h>
#include <IO/HadoopSnappyReadBuffer.h>
#include <Common/config.h>
#include "config.h"
#include <boost/algorithm/string/case_conv.hpp>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_SSL
#include <Core/Types.h>

View File

@ -9,7 +9,7 @@
#include <Poco/Version.h>
#include <Common/config.h>
#include "config.h"
#if USE_SSL
# include <Poco/Net/AcceptCertificateHandler.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#if USE_SNAPPY
#include <fcntl.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_SNAPPY

View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/config.h>
#include "config.h"
#if USE_SSL
#include <IO/ReadBufferFromFileBase.h>

View File

@ -1,4 +1,4 @@
#include <Common/config.h>
#include "config.h"
#include "IO/S3Common.h"
#if USE_AWS_S3

View File

@ -1,7 +1,7 @@
#pragma once
#include <Common/RangeGenerator.h>
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

View File

@ -23,7 +23,7 @@
#include <Poco/Version.h>
#include <Common/DNSResolver.h>
#include <Common/RemoteHostFilter.h>
#include <Common/config.h>
#include "config.h"
#include <Common/config_version.h>
#include <filesystem>

View File

@ -1,5 +1,5 @@
#include "Common/DNSResolver.h"
#include <Common/config.h>
#include "config.h"
#if USE_AWS_S3

Some files were not shown because too many files have changed in this diff Show More