Merge pull request #11746 from azat/build-fix

Fix usage/linking of static dbms library (add clickhouse_aggregate_functions)
This commit is contained in:
alexey-milovidov 2020-06-19 14:26:52 +03:00 committed by GitHub
commit 397f0aa721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View File

@ -4,6 +4,7 @@ add_headers_and_sources(clickhouse_aggregate_functions .)
list(REMOVE_ITEM clickhouse_aggregate_functions_sources list(REMOVE_ITEM clickhouse_aggregate_functions_sources
AggregateFunctionFactory.cpp AggregateFunctionFactory.cpp
AggregateFunctionCombinatorFactory.cpp AggregateFunctionCombinatorFactory.cpp
AggregateFunctionCount.cpp
AggregateFunctionState.cpp AggregateFunctionState.cpp
parseAggregateFunctionParameters.cpp parseAggregateFunctionParameters.cpp
FactoryHelpers.cpp FactoryHelpers.cpp
@ -14,6 +15,7 @@ list(REMOVE_ITEM clickhouse_aggregate_functions_headers
IAggregateFunctionCombinator.h IAggregateFunctionCombinator.h
AggregateFunctionFactory.h AggregateFunctionFactory.h
AggregateFunctionCombinatorFactory.h AggregateFunctionCombinatorFactory.h
AggregateFunctionCount.h
AggregateFunctionState.h AggregateFunctionState.h
parseAggregateFunctionParameters.h parseAggregateFunctionParameters.h
FactoryHelpers.h FactoryHelpers.h

View File

@ -88,6 +88,7 @@ list (APPEND dbms_sources
AggregateFunctions/AggregateFunctionFactory.cpp AggregateFunctions/AggregateFunctionFactory.cpp
AggregateFunctions/AggregateFunctionCombinatorFactory.cpp AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
AggregateFunctions/AggregateFunctionState.cpp AggregateFunctions/AggregateFunctionState.cpp
AggregateFunctions/AggregateFunctionCount.cpp
AggregateFunctions/parseAggregateFunctionParameters.cpp) AggregateFunctions/parseAggregateFunctionParameters.cpp)
list (APPEND dbms_headers list (APPEND dbms_headers
@ -96,6 +97,7 @@ list (APPEND dbms_headers
AggregateFunctions/AggregateFunctionFactory.h AggregateFunctions/AggregateFunctionFactory.h
AggregateFunctions/AggregateFunctionCombinatorFactory.h AggregateFunctions/AggregateFunctionCombinatorFactory.h
AggregateFunctions/AggregateFunctionState.h AggregateFunctions/AggregateFunctionState.h
AggregateFunctions/AggregateFunctionCount.cpp
AggregateFunctions/FactoryHelpers.h AggregateFunctions/FactoryHelpers.h
AggregateFunctions/parseAggregateFunctionParameters.h) AggregateFunctions/parseAggregateFunctionParameters.h)