From 49961452247fb8f111e20d18d7d6ebc3ad4ca7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20M=C3=BChleisen?= Date: Wed, 15 Jul 2020 08:14:08 +0200 Subject: [PATCH] removed unity build --- CMakeLists.txt | 72 ------------------- Makefile | 21 +++--- src/catalog/CMakeLists.txt | 2 +- src/catalog/catalog_entry/CMakeLists.txt | 2 +- src/common/CMakeLists.txt | 2 +- src/common/enums/CMakeLists.txt | 2 +- src/common/operator/CMakeLists.txt | 2 +- src/common/serializer/CMakeLists.txt | 2 +- src/common/types/CMakeLists.txt | 2 +- src/common/value_operations/CMakeLists.txt | 2 +- src/common/vector_operations/CMakeLists.txt | 2 +- src/execution/CMakeLists.txt | 2 +- .../expression_executor/CMakeLists.txt | 2 +- src/execution/index/art/CMakeLists.txt | 2 +- src/execution/merge_join/CMakeLists.txt | 2 +- src/execution/nested_loop_join/CMakeLists.txt | 2 +- .../operator/aggregate/CMakeLists.txt | 2 +- src/execution/operator/filter/CMakeLists.txt | 2 +- src/execution/operator/helper/CMakeLists.txt | 2 +- src/execution/operator/join/CMakeLists.txt | 2 +- src/execution/operator/order/CMakeLists.txt | 2 +- .../operator/persistent/CMakeLists.txt | 2 +- .../operator/projection/CMakeLists.txt | 2 +- src/execution/operator/scan/CMakeLists.txt | 2 +- src/execution/operator/schema/CMakeLists.txt | 2 +- src/execution/operator/set/CMakeLists.txt | 2 +- src/execution/physical_plan/CMakeLists.txt | 2 +- src/function/CMakeLists.txt | 2 +- src/function/aggregate/CMakeLists.txt | 2 +- .../aggregate/algebraic/CMakeLists.txt | 2 +- .../aggregate/distributive/CMakeLists.txt | 2 +- src/function/aggregate/nested/CMakeLists.txt | 2 +- src/function/scalar/CMakeLists.txt | 2 +- src/function/scalar/date/CMakeLists.txt | 2 +- src/function/scalar/generic/CMakeLists.txt | 2 +- src/function/scalar/math/CMakeLists.txt | 2 +- src/function/scalar/nested/CMakeLists.txt | 2 +- src/function/scalar/operators/CMakeLists.txt | 2 +- src/function/scalar/sequence/CMakeLists.txt | 2 +- src/function/scalar/string/CMakeLists.txt | 2 +- src/function/table/CMakeLists.txt | 2 +- src/function/table/sqlite/CMakeLists.txt | 2 +- .../duckdb/parallel/task_scheduler.hpp | 1 + src/main/CMakeLists.txt | 2 +- src/main/relation/CMakeLists.txt | 2 +- src/optimizer/CMakeLists.txt | 2 +- src/optimizer/join_order/CMakeLists.txt | 2 +- src/optimizer/matcher/CMakeLists.txt | 2 +- src/optimizer/pushdown/CMakeLists.txt | 2 +- src/optimizer/rule/CMakeLists.txt | 2 +- src/parallel/CMakeLists.txt | 2 +- src/parser/CMakeLists.txt | 2 +- src/parser/constraints/CMakeLists.txt | 2 +- src/parser/expression/CMakeLists.txt | 2 +- src/parser/parsed_data/CMakeLists.txt | 2 +- src/parser/query_node/CMakeLists.txt | 2 +- src/parser/statement/CMakeLists.txt | 2 +- src/parser/tableref/CMakeLists.txt | 2 +- .../transform/constraint/CMakeLists.txt | 2 +- .../transform/expression/CMakeLists.txt | 2 +- src/parser/transform/helpers/CMakeLists.txt | 2 +- src/parser/transform/statement/CMakeLists.txt | 2 +- src/parser/transform/tableref/CMakeLists.txt | 2 +- src/planner/CMakeLists.txt | 2 +- src/planner/binder/expression/CMakeLists.txt | 2 +- src/planner/binder/query_node/CMakeLists.txt | 2 +- src/planner/binder/statement/CMakeLists.txt | 2 +- src/planner/binder/tableref/CMakeLists.txt | 2 +- src/planner/expression/CMakeLists.txt | 2 +- src/planner/expression_binder/CMakeLists.txt | 2 +- src/planner/operator/CMakeLists.txt | 2 +- src/planner/subquery/CMakeLists.txt | 2 +- src/storage/CMakeLists.txt | 2 +- src/storage/buffer/CMakeLists.txt | 2 +- src/storage/checkpoint/CMakeLists.txt | 2 +- src/storage/table/CMakeLists.txt | 2 +- src/transaction/CMakeLists.txt | 2 +- test/api/CMakeLists.txt | 4 +- test/appender/CMakeLists.txt | 2 +- test/common/CMakeLists.txt | 2 +- test/dbtransfer/CMakeLists.txt | 2 +- test/monetdb/CMakeLists.txt | 2 +- test/nested/CMakeLists.txt | 2 +- test/optimizer/CMakeLists.txt | 2 +- test/parser/CMakeLists.txt | 2 +- test/persistence/CMakeLists.txt | 2 +- test/planner/CMakeLists.txt | 2 +- test/rigger/CMakeLists.txt | 2 +- test/sakila/CMakeLists.txt | 2 +- test/sql/aggregate/CMakeLists.txt | 2 +- test/sql/alter/CMakeLists.txt | 2 +- test/sql/append/CMakeLists.txt | 2 +- test/sql/binder/CMakeLists.txt | 2 +- test/sql/blob/CMakeLists.txt | 2 +- test/sql/capi/CMakeLists.txt | 2 +- test/sql/cast/CMakeLists.txt | 2 +- test/sql/catalog/CMakeLists.txt | 2 +- test/sql/collate/CMakeLists.txt | 2 +- test/sql/constraints/CMakeLists.txt | 2 +- test/sql/copy/CMakeLists.txt | 2 +- test/sql/create/CMakeLists.txt | 2 +- test/sql/date/CMakeLists.txt | 2 +- test/sql/delete/CMakeLists.txt | 2 +- test/sql/explain/CMakeLists.txt | 2 +- test/sql/filter/CMakeLists.txt | 2 +- test/sql/filter_pushdown/CMakeLists.txt | 2 +- test/sql/function/CMakeLists.txt | 2 +- test/sql/index/CMakeLists.txt | 2 +- test/sql/join/CMakeLists.txt | 2 +- test/sql/naughty/CMakeLists.txt | 2 +- test/sql/order/CMakeLists.txt | 2 +- test/sql/parallelism/CMakeLists.txt | 2 +- test/sql/pragma/CMakeLists.txt | 2 +- test/sql/prepared/CMakeLists.txt | 2 +- test/sql/schema/CMakeLists.txt | 2 +- test/sql/setops/CMakeLists.txt | 2 +- test/sql/simple/CMakeLists.txt | 2 +- test/sql/storage/CMakeLists.txt | 4 +- test/sql/subquery/CMakeLists.txt | 2 +- test/sql/tpcds/CMakeLists.txt | 2 +- test/sql/tpch/CMakeLists.txt | 2 +- test/sql/transactions/CMakeLists.txt | 2 +- test/sql/udf_function/CMakeLists.txt | 2 +- test/sql/update/CMakeLists.txt | 2 +- test/sql/varchar/CMakeLists.txt | 2 +- test/sql/views/CMakeLists.txt | 2 +- test/sqlite/CMakeLists.txt | 2 +- test/sqlserver/CMakeLists.txt | 2 +- test/sqlsmith/CMakeLists.txt | 2 +- test/tpce/CMakeLists.txt | 2 +- 130 files changed, 140 insertions(+), 212 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b2e4a718c9..775ce3c4a89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,78 +172,6 @@ include_directories(third_party/utf8proc/include) include_directories(third_party/miniparquet) include_directories(third_party/concurrentqueue) -# todo only regenerate ub file if one of the input files changed hack alert -function(enable_unity_build UB_SUFFIX SOURCE_VARIABLE_NAME) - set(files ${${SOURCE_VARIABLE_NAME}}) - - # Generate a unique filename for the unity build translation unit - set(unit_build_file ${CMAKE_CURRENT_BINARY_DIR}/ub_${UB_SUFFIX}.cpp) - set(temp_unit_build_file ${CMAKE_CURRENT_BINARY_DIR}/ub_${UB_SUFFIX}.cpp.tmp) - # Exclude all translation units from compilation - set_source_files_properties(${files} - PROPERTIES - HEADER_FILE_ONLY - true) - - set(rebuild FALSE) - # check if any of the source files have changed - foreach(source_file ${files}) - if(${CMAKE_CURRENT_SOURCE_DIR}/${source_file} IS_NEWER_THAN - ${unit_build_file}) - set(rebuild TRUE) - endif() - endforeach(source_file) - # write a temporary file - file(WRITE ${temp_unit_build_file} "// Unity Build generated by CMake\n") - foreach(source_file ${files}) - file( - APPEND ${temp_unit_build_file} - "#line 0 \"${source_file}\"\n#include <${CMAKE_CURRENT_SOURCE_DIR}/${source_file}>\n" - ) - endforeach(source_file) - - execute_process(COMMAND ${CMAKE_COMMAND} - -E - compare_files - ${unit_build_file} - ${temp_unit_build_file} - RESULT_VARIABLE compare_result - OUTPUT_VARIABLE bla - ERROR_VARIABLE bla) - if(compare_result EQUAL 0) - # files are identical: do nothing - elseif(compare_result EQUAL 1) - # files are different: rebuild - set(rebuild TRUE) - else() - # error while compiling: rebuild - set(rebuild TRUE) - endif() - - if(${rebuild}) - file(WRITE ${unit_build_file} "// Unity Build generated by CMake\n") - foreach(source_file ${files}) - file( - APPEND ${unit_build_file} - "#line 0 \"${source_file}\"\n#include <${CMAKE_CURRENT_SOURCE_DIR}/${source_file}>\n" - ) - endforeach(source_file) - endif() - - # Complement list of translation units with the name of ub - set(${SOURCE_VARIABLE_NAME} - ${${SOURCE_VARIABLE_NAME}} ${unit_build_file} - PARENT_SCOPE) -endfunction(enable_unity_build) - -function(add_library_unity NAME MODE) - set(SRCS ${ARGN}) - if(NOT DISABLE_UNITY) - enable_unity_build(${NAME} SRCS) - endif() - add_library(${NAME} OBJECT ${SRCS}) -endfunction() - function(disable_target_warnings NAME) if(MSVC) target_compile_options(${NAME} PRIVATE "/W0") diff --git a/Makefile b/Makefile index 734b90e31b4..2c9f6979a7b 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ imdb: third_party/imdb/data GENERATOR= FORCE_COLOR= WARNINGS_AS_ERRORS= -DISABLE_UNITY_FLAG= ifeq ($(GEN),ninja) GENERATOR=-G "Ninja" FORCE_COLOR=-DFORCE_COLORED_OUTPUT=1 @@ -16,9 +15,9 @@ endif ifeq (${TREAT_WARNINGS_AS_ERRORS}, 1) WARNINGS_AS_ERRORS=-DTREAT_WARNINGS_AS_ERRORS=1 endif -ifeq (${DISABLE_UNITY}, 1) - DISABLE_UNITY_FLAG=-DDISABLE_UNITY=1 -endif + +EXTENSIONS="-DBUILD_PARQUET_EXTENSION=TRUE -DBUILD_ICU_EXTENSION=TRUE" + clean: rm -rf build @@ -26,13 +25,13 @@ clean: debug: mkdir -p build/debug && \ cd build/debug && \ - cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${DISABLE_UNITY_FLAG} -DCMAKE_BUILD_TYPE=Debug ../.. && \ + cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${EXTENSIONS} -DCMAKE_BUILD_TYPE=Debug ../.. && \ cmake --build . release_expanded: mkdir -p build/release_expanded && \ cd build/release_expanded && \ - cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${DISABLE_UNITY_FLAG} -DCMAKE_BUILD_TYPE=Release ../.. && \ + cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${EXTENSIONS} -DCMAKE_BUILD_TYPE=Release ../.. && \ cmake --build . unittest: debug @@ -53,34 +52,34 @@ release: mkdir -p build/release && \ python scripts/amalgamation.py && \ cd build/release && \ - cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${DISABLE_UNITY_FLAG} -DCMAKE_BUILD_TYPE=Release -DAMALGAMATION_BUILD=1 ../.. && \ + cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${EXTENSIONS} -DCMAKE_BUILD_TYPE=Release -DAMALGAMATION_BUILD=1 ../.. && \ cmake --build . reldebug: mkdir -p build/reldebug && \ cd build/reldebug && \ - cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${DISABLE_UNITY_FLAG} -DCMAKE_BUILD_TYPE=RelWithDebInfo ../.. && \ + cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${EXTENSIONS} -DCMAKE_BUILD_TYPE=RelWithDebInfo ../.. && \ cmake --build . amaldebug: mkdir -p build/amaldebug && \ python scripts/amalgamation.py && \ cd build/amaldebug && \ - cmake $(GENERATOR) $(FORCE_COLOR) -DAMALGAMATION_BUILD=1 -DCMAKE_BUILD_TYPE=Debug ../.. && \ + cmake $(GENERATOR) $(FORCE_COLOR) -DAMALGAMATION_BUILD=1 ${EXTENSIONS} -DCMAKE_BUILD_TYPE=Debug ../.. && \ cmake --build . jdbc: mkdir -p build/release && \ python scripts/amalgamation.py && \ cd build/release && \ - cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${DISABLE_UNITY_FLAG} -DCMAKE_BUILD_TYPE=Release -DAMALGAMATION_BUILD=1 -DJDBC_DRIVER=1 ../.. && \ + cmake $(GENERATOR) $(FORCE_COLOR) ${WARNINGS_AS_ERRORS} ${EXTENSIONS} -DCMAKE_BUILD_TYPE=Release -DAMALGAMATION_BUILD=1 -DJDBC_DRIVER=1 ../.. && \ cmake --build . jdbcdebug: mkdir -p build/jdbcdebug && \ cd build/jdbcdebug && \ - cmake $(GENERATOR) $(FORCE_COLOR) -DJDBC_DRIVER=1 -DENABLE_SANITIZER=FALSE -DCMAKE_BUILD_TYPE=Debug ../.. && \ + cmake $(GENERATOR) $(FORCE_COLOR) -DJDBC_DRIVER=1 -DENABLE_SANITIZER=FALSE ${EXTENSIONS} -DCMAKE_BUILD_TYPE=Debug ../.. && \ cmake --build . test_compile: # test compilation of individual cpp files diff --git a/src/catalog/CMakeLists.txt b/src/catalog/CMakeLists.txt index bf25aeee9dc..9b194434dfa 100644 --- a/src/catalog/CMakeLists.txt +++ b/src/catalog/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(catalog_entry) -add_library_unity(duckdb_catalog +add_library(duckdb_catalog OBJECT catalog_entry.cpp catalog.cpp diff --git a/src/catalog/catalog_entry/CMakeLists.txt b/src/catalog/catalog_entry/CMakeLists.txt index eff60dc8e98..8e2bf99dbac 100644 --- a/src/catalog/catalog_entry/CMakeLists.txt +++ b/src/catalog/catalog_entry/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_catalog_entries +add_library(duckdb_catalog_entries OBJECT index_catalog_entry.cpp schema_catalog_entry.cpp diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index dcc8f32a792..851f3713b73 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -5,7 +5,7 @@ add_subdirectory(types) add_subdirectory(value_operations) add_subdirectory(vector_operations) -add_library_unity(duckdb_common +add_library(duckdb_common OBJECT constants.cpp checksum.cpp diff --git a/src/common/enums/CMakeLists.txt b/src/common/enums/CMakeLists.txt index ef7f7844c9d..b635de55218 100644 --- a/src/common/enums/CMakeLists.txt +++ b/src/common/enums/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_common_enums +add_library(duckdb_common_enums OBJECT catalog_type.cpp expression_type.cpp diff --git a/src/common/operator/CMakeLists.txt b/src/common/operator/CMakeLists.txt index 6ab4a6ee11b..a6b4b5ea25c 100644 --- a/src/common/operator/CMakeLists.txt +++ b/src/common/operator/CMakeLists.txt @@ -1,3 +1,3 @@ -add_library_unity(duckdb_common_operators OBJECT cast_operators.cpp) +add_library(duckdb_common_operators OBJECT cast_operators.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/common/serializer/CMakeLists.txt b/src/common/serializer/CMakeLists.txt index 3e90f5ca5dc..e5068316f02 100644 --- a/src/common/serializer/CMakeLists.txt +++ b/src/common/serializer/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_common_serializer +add_library(duckdb_common_serializer OBJECT buffered_deserializer.cpp buffered_file_reader.cpp diff --git a/src/common/types/CMakeLists.txt b/src/common/types/CMakeLists.txt index 40277b1381c..fe5bc9eac1f 100644 --- a/src/common/types/CMakeLists.txt +++ b/src/common/types/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_common_types +add_library(duckdb_common_types OBJECT chunk_collection.cpp data_chunk.cpp diff --git a/src/common/value_operations/CMakeLists.txt b/src/common/value_operations/CMakeLists.txt index 3165a739f59..8c1cd3cc72c 100644 --- a/src/common/value_operations/CMakeLists.txt +++ b/src/common/value_operations/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_value_operations +add_library(duckdb_value_operations OBJECT comparison_operations.cpp hash.cpp diff --git a/src/common/vector_operations/CMakeLists.txt b/src/common/vector_operations/CMakeLists.txt index 99c47d21d2a..7bb31039640 100644 --- a/src/common/vector_operations/CMakeLists.txt +++ b/src/common/vector_operations/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_vector_operations +add_library(duckdb_vector_operations OBJECT boolean_operators.cpp vector_cast.cpp diff --git a/src/execution/CMakeLists.txt b/src/execution/CMakeLists.txt index 1f6333f9a8a..853b8358da2 100644 --- a/src/execution/CMakeLists.txt +++ b/src/execution/CMakeLists.txt @@ -5,7 +5,7 @@ add_subdirectory(operator) add_subdirectory(physical_plan) add_subdirectory(index/art) -add_library_unity(duckdb_execution +add_library(duckdb_execution OBJECT adaptive_filter.cpp aggregate_hashtable.cpp diff --git a/src/execution/expression_executor/CMakeLists.txt b/src/execution/expression_executor/CMakeLists.txt index c1e4580b453..c3ec92671b7 100644 --- a/src/execution/expression_executor/CMakeLists.txt +++ b/src/execution/expression_executor/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_expression_executor +add_library(duckdb_expression_executor OBJECT execute_between.cpp execute_case.cpp diff --git a/src/execution/index/art/CMakeLists.txt b/src/execution/index/art/CMakeLists.txt index 689e64d655b..2deb042d28f 100644 --- a/src/execution/index/art/CMakeLists.txt +++ b/src/execution/index/art/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_art_index_execution +add_library(duckdb_art_index_execution OBJECT art_key.cpp leaf.cpp diff --git a/src/execution/merge_join/CMakeLists.txt b/src/execution/merge_join/CMakeLists.txt index f412fef613d..5b1b8df5b1c 100644 --- a/src/execution/merge_join/CMakeLists.txt +++ b/src/execution/merge_join/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_merge_join +add_library(duckdb_merge_join OBJECT merge_join.cpp merge_join_complex.cpp diff --git a/src/execution/nested_loop_join/CMakeLists.txt b/src/execution/nested_loop_join/CMakeLists.txt index 1a74d9aa1d6..dd432e7cc8e 100644 --- a/src/execution/nested_loop_join/CMakeLists.txt +++ b/src/execution/nested_loop_join/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_nested_loop_join +add_library(duckdb_nested_loop_join OBJECT nested_loop_join_inner.cpp nested_loop_join_mark.cpp) diff --git a/src/execution/operator/aggregate/CMakeLists.txt b/src/execution/operator/aggregate/CMakeLists.txt index 0e19181a7ee..0dd5a21753f 100644 --- a/src/execution/operator/aggregate/CMakeLists.txt +++ b/src/execution/operator/aggregate/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_aggregate +add_library(duckdb_operator_aggregate OBJECT physical_hash_aggregate.cpp physical_simple_aggregate.cpp diff --git a/src/execution/operator/filter/CMakeLists.txt b/src/execution/operator/filter/CMakeLists.txt index d928a244a92..f60b0e957f6 100644 --- a/src/execution/operator/filter/CMakeLists.txt +++ b/src/execution/operator/filter/CMakeLists.txt @@ -1,3 +1,3 @@ -add_library_unity(duckdb_operator_filter OBJECT physical_filter.cpp) +add_library(duckdb_operator_filter OBJECT physical_filter.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/execution/operator/helper/CMakeLists.txt b/src/execution/operator/helper/CMakeLists.txt index 04d39a6a6d6..5ecaaca6464 100644 --- a/src/execution/operator/helper/CMakeLists.txt +++ b/src/execution/operator/helper/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_helper +add_library(duckdb_operator_helper OBJECT physical_execute.cpp physical_limit.cpp diff --git a/src/execution/operator/join/CMakeLists.txt b/src/execution/operator/join/CMakeLists.txt index 32ed424d22a..bb584904a37 100644 --- a/src/execution/operator/join/CMakeLists.txt +++ b/src/execution/operator/join/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_join +add_library(duckdb_operator_join OBJECT physical_blockwise_nl_join.cpp physical_comparison_join.cpp diff --git a/src/execution/operator/order/CMakeLists.txt b/src/execution/operator/order/CMakeLists.txt index 0e4ab925405..13481421754 100644 --- a/src/execution/operator/order/CMakeLists.txt +++ b/src/execution/operator/order/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_order +add_library(duckdb_operator_order OBJECT physical_order.cpp physical_top_n.cpp) diff --git a/src/execution/operator/persistent/CMakeLists.txt b/src/execution/operator/persistent/CMakeLists.txt index 169a14a500f..59f09c41709 100644 --- a/src/execution/operator/persistent/CMakeLists.txt +++ b/src/execution/operator/persistent/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_persistent +add_library(duckdb_operator_persistent OBJECT buffered_csv_reader.cpp physical_copy_from_file.cpp diff --git a/src/execution/operator/projection/CMakeLists.txt b/src/execution/operator/projection/CMakeLists.txt index 888135de1fd..74be9eaa993 100644 --- a/src/execution/operator/projection/CMakeLists.txt +++ b/src/execution/operator/projection/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_projection +add_library(duckdb_operator_projection OBJECT physical_projection.cpp physical_unnest.cpp diff --git a/src/execution/operator/scan/CMakeLists.txt b/src/execution/operator/scan/CMakeLists.txt index c278bd6ab9c..b2610dc1036 100644 --- a/src/execution/operator/scan/CMakeLists.txt +++ b/src/execution/operator/scan/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_scan +add_library(duckdb_operator_scan OBJECT physical_chunk_scan.cpp physical_dummy_scan.cpp diff --git a/src/execution/operator/schema/CMakeLists.txt b/src/execution/operator/schema/CMakeLists.txt index b45220499e9..339e5b34557 100644 --- a/src/execution/operator/schema/CMakeLists.txt +++ b/src/execution/operator/schema/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_schema +add_library(duckdb_operator_schema OBJECT physical_alter.cpp physical_create_index.cpp diff --git a/src/execution/operator/set/CMakeLists.txt b/src/execution/operator/set/CMakeLists.txt index 537c27cd4fe..928f1b78ced 100644 --- a/src/execution/operator/set/CMakeLists.txt +++ b/src/execution/operator/set/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_operator_set OBJECT physical_union.cpp physical_recursive_cte.cpp) +add_library(duckdb_operator_set OBJECT physical_union.cpp physical_recursive_cte.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/execution/physical_plan/CMakeLists.txt b/src/execution/physical_plan/CMakeLists.txt index b1d7d8d5a7b..458dd415f38 100644 --- a/src/execution/physical_plan/CMakeLists.txt +++ b/src/execution/physical_plan/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_physical_plan +add_library(duckdb_physical_plan OBJECT plan_aggregate.cpp plan_any_join.cpp diff --git a/src/function/CMakeLists.txt b/src/function/CMakeLists.txt index cb01082e38d..d1d8561d936 100644 --- a/src/function/CMakeLists.txt +++ b/src/function/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(aggregate) add_subdirectory(scalar) add_subdirectory(table) -add_library_unity(duckdb_function +add_library(duckdb_function OBJECT cast_rules.cpp function.cpp diff --git a/src/function/aggregate/CMakeLists.txt b/src/function/aggregate/CMakeLists.txt index c9972654d72..fe286743053 100644 --- a/src/function/aggregate/CMakeLists.txt +++ b/src/function/aggregate/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(algebraic) add_subdirectory(distributive) add_subdirectory(nested) -add_library_unity(duckdb_func_aggr +add_library(duckdb_func_aggr OBJECT algebraic_functions.cpp distributive_functions.cpp diff --git a/src/function/aggregate/algebraic/CMakeLists.txt b/src/function/aggregate/algebraic/CMakeLists.txt index 0bdc6b042c3..752b1c51004 100644 --- a/src/function/aggregate/algebraic/CMakeLists.txt +++ b/src/function/aggregate/algebraic/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_aggr_algebraic +add_library(duckdb_aggr_algebraic OBJECT avg.cpp covar.cpp diff --git a/src/function/aggregate/distributive/CMakeLists.txt b/src/function/aggregate/distributive/CMakeLists.txt index 364a3b77244..425a9b4b8f2 100644 --- a/src/function/aggregate/distributive/CMakeLists.txt +++ b/src/function/aggregate/distributive/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_aggr_distr +add_library(duckdb_aggr_distr OBJECT bitagg.cpp count.cpp diff --git a/src/function/aggregate/nested/CMakeLists.txt b/src/function/aggregate/nested/CMakeLists.txt index ac3799ecb47..feb10a1eb63 100644 --- a/src/function/aggregate/nested/CMakeLists.txt +++ b/src/function/aggregate/nested/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_aggr_nested +add_library(duckdb_aggr_nested OBJECT list.cpp) set(ALL_OBJECT_FILES diff --git a/src/function/scalar/CMakeLists.txt b/src/function/scalar/CMakeLists.txt index 40436b20342..2f849142efa 100644 --- a/src/function/scalar/CMakeLists.txt +++ b/src/function/scalar/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(sequence) add_subdirectory(string) add_subdirectory(nested) -add_library_unity(duckdb_func_scalar +add_library(duckdb_func_scalar OBJECT date_functions.cpp generic_functions.cpp diff --git a/src/function/scalar/date/CMakeLists.txt b/src/function/scalar/date/CMakeLists.txt index 667e3e3fdb5..70247b97326 100644 --- a/src/function/scalar/date/CMakeLists.txt +++ b/src/function/scalar/date/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity( +add_library( duckdb_func_date OBJECT age.cpp diff --git a/src/function/scalar/generic/CMakeLists.txt b/src/function/scalar/generic/CMakeLists.txt index d0eab98d5a2..f4c1be86ae0 100644 --- a/src/function/scalar/generic/CMakeLists.txt +++ b/src/function/scalar/generic/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_func_generic +add_library(duckdb_func_generic OBJECT least.cpp) set(ALL_OBJECT_FILES diff --git a/src/function/scalar/math/CMakeLists.txt b/src/function/scalar/math/CMakeLists.txt index f0ef0b141a5..ed6bdac0fdb 100644 --- a/src/function/scalar/math/CMakeLists.txt +++ b/src/function/scalar/math/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_func_math +add_library(duckdb_func_math OBJECT numeric.cpp random.cpp diff --git a/src/function/scalar/nested/CMakeLists.txt b/src/function/scalar/nested/CMakeLists.txt index 3b8e9bb281d..d06c04d8aea 100644 --- a/src/function/scalar/nested/CMakeLists.txt +++ b/src/function/scalar/nested/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_func_nested +add_library(duckdb_func_nested OBJECT list_value.cpp struct_extract.cpp diff --git a/src/function/scalar/operators/CMakeLists.txt b/src/function/scalar/operators/CMakeLists.txt index 50b6be27098..df95463c6bb 100644 --- a/src/function/scalar/operators/CMakeLists.txt +++ b/src/function/scalar/operators/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_func_ops +add_library(duckdb_func_ops OBJECT arithmetic.cpp bitwise.cpp) diff --git a/src/function/scalar/sequence/CMakeLists.txt b/src/function/scalar/sequence/CMakeLists.txt index 40091610746..57540543297 100644 --- a/src/function/scalar/sequence/CMakeLists.txt +++ b/src/function/scalar/sequence/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_func_seq OBJECT nextval.cpp) +add_library(duckdb_func_seq OBJECT nextval.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/function/scalar/string/CMakeLists.txt b/src/function/scalar/string/CMakeLists.txt index d29adf5dd6e..a90d0f77e17 100644 --- a/src/function/scalar/string/CMakeLists.txt +++ b/src/function/scalar/string/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity( +add_library( duckdb_func_string OBJECT reverse.cpp diff --git a/src/function/table/CMakeLists.txt b/src/function/table/CMakeLists.txt index 07250ef020e..daf7d58311b 100644 --- a/src/function/table/CMakeLists.txt +++ b/src/function/table/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(sqlite) -add_library_unity(duckdb_func_table +add_library(duckdb_func_table OBJECT read_csv.cpp sqlite_functions.cpp) diff --git a/src/function/table/sqlite/CMakeLists.txt b/src/function/table/sqlite/CMakeLists.txt index da839ff34d5..4d04226275d 100644 --- a/src/function/table/sqlite/CMakeLists.txt +++ b/src/function/table/sqlite/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_func_sqlite +add_library(duckdb_func_sqlite OBJECT pragma_collations.cpp pragma_table_info.cpp diff --git a/src/include/duckdb/parallel/task_scheduler.hpp b/src/include/duckdb/parallel/task_scheduler.hpp index 19c6c234641..fca6168342a 100644 --- a/src/include/duckdb/parallel/task_scheduler.hpp +++ b/src/include/duckdb/parallel/task_scheduler.hpp @@ -19,6 +19,7 @@ namespace duckdb { class Pipeline; class Executor; +class ClientContext; struct Semaphore; diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index f3aa3cdad9c..d65e6ab0977 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(relation) -add_library_unity(duckdb_main +add_library(duckdb_main OBJECT appender.cpp client_context.cpp diff --git a/src/main/relation/CMakeLists.txt b/src/main/relation/CMakeLists.txt index bac5bba8a21..14aa85d7f64 100644 --- a/src/main/relation/CMakeLists.txt +++ b/src/main/relation/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_main_relation +add_library(duckdb_main_relation OBJECT aggregate_relation.cpp create_table_relation.cpp diff --git a/src/optimizer/CMakeLists.txt b/src/optimizer/CMakeLists.txt index 21aaa19ab4e..085342a9108 100644 --- a/src/optimizer/CMakeLists.txt +++ b/src/optimizer/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(join_order) add_subdirectory(pushdown) add_subdirectory(rule) -add_library_unity(duckdb_optimizer +add_library(duckdb_optimizer OBJECT cse_optimizer.cpp column_lifetime_analyzer.cpp diff --git a/src/optimizer/join_order/CMakeLists.txt b/src/optimizer/join_order/CMakeLists.txt index e0692bc64b5..d777f12fce5 100644 --- a/src/optimizer/join_order/CMakeLists.txt +++ b/src/optimizer/join_order/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_optimizer_join_order +add_library(duckdb_optimizer_join_order OBJECT query_graph.cpp relation.cpp) diff --git a/src/optimizer/matcher/CMakeLists.txt b/src/optimizer/matcher/CMakeLists.txt index dad0070e046..f2d682988fb 100644 --- a/src/optimizer/matcher/CMakeLists.txt +++ b/src/optimizer/matcher/CMakeLists.txt @@ -1,3 +1,3 @@ -add_library_unity(duckdb_optimizer_matcher OBJECT expression_matcher.cpp) +add_library(duckdb_optimizer_matcher OBJECT expression_matcher.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/optimizer/pushdown/CMakeLists.txt b/src/optimizer/pushdown/CMakeLists.txt index 4338d5591a9..a0862213686 100644 --- a/src/optimizer/pushdown/CMakeLists.txt +++ b/src/optimizer/pushdown/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_optimizer_pushdown +add_library(duckdb_optimizer_pushdown OBJECT pushdown_aggregate.cpp pushdown_cross_product.cpp diff --git a/src/optimizer/rule/CMakeLists.txt b/src/optimizer/rule/CMakeLists.txt index b73ed7d2208..7a59aae07f9 100644 --- a/src/optimizer/rule/CMakeLists.txt +++ b/src/optimizer/rule/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_optimizer_rules +add_library(duckdb_optimizer_rules OBJECT arithmetic_simplification.cpp case_simplification.cpp diff --git a/src/parallel/CMakeLists.txt b/src/parallel/CMakeLists.txt index e303765193f..86dc25f2145 100644 --- a/src/parallel/CMakeLists.txt +++ b/src/parallel/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_parallel +add_library(duckdb_parallel OBJECT executor.cpp pipeline.cpp diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt index e39b8ba82b8..e7a34fcb41c 100644 --- a/src/parser/CMakeLists.txt +++ b/src/parser/CMakeLists.txt @@ -9,7 +9,7 @@ add_subdirectory(statement) add_subdirectory(tableref) add_subdirectory(transform) -add_library_unity(duckdb_parser +add_library(duckdb_parser OBJECT base_expression.cpp column_definition.cpp diff --git a/src/parser/constraints/CMakeLists.txt b/src/parser/constraints/CMakeLists.txt index e9b6308c9df..3a3e3482dac 100644 --- a/src/parser/constraints/CMakeLists.txt +++ b/src/parser/constraints/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_constraints +add_library(duckdb_constraints OBJECT check_constraint.cpp not_null_constraint.cpp diff --git a/src/parser/expression/CMakeLists.txt b/src/parser/expression/CMakeLists.txt index 83c1be282f6..89128d9acdf 100644 --- a/src/parser/expression/CMakeLists.txt +++ b/src/parser/expression/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_expression +add_library(duckdb_expression OBJECT case_expression.cpp cast_expression.cpp diff --git a/src/parser/parsed_data/CMakeLists.txt b/src/parser/parsed_data/CMakeLists.txt index 94680a96fdc..1c1b4e76590 100644 --- a/src/parser/parsed_data/CMakeLists.txt +++ b/src/parser/parsed_data/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_parsed_data OBJECT alter_table_info.cpp) +add_library(duckdb_parsed_data OBJECT alter_table_info.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/parser/query_node/CMakeLists.txt b/src/parser/query_node/CMakeLists.txt index ec6db6d494f..af1cdb1c276 100644 --- a/src/parser/query_node/CMakeLists.txt +++ b/src/parser/query_node/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_query_node +add_library(duckdb_query_node OBJECT recursive_cte_node.cpp select_node.cpp diff --git a/src/parser/statement/CMakeLists.txt b/src/parser/statement/CMakeLists.txt index b4d162ed81c..0a8e3897d81 100644 --- a/src/parser/statement/CMakeLists.txt +++ b/src/parser/statement/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_statement OBJECT select_statement.cpp) +add_library(duckdb_statement OBJECT select_statement.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/parser/tableref/CMakeLists.txt b/src/parser/tableref/CMakeLists.txt index 3433b8d5e7d..b5cc945d35c 100644 --- a/src/parser/tableref/CMakeLists.txt +++ b/src/parser/tableref/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_parser_tableref +add_library(duckdb_parser_tableref OBJECT basetableref.cpp crossproductref.cpp diff --git a/src/parser/transform/constraint/CMakeLists.txt b/src/parser/transform/constraint/CMakeLists.txt index b1d57cbb406..0a0d7c364a5 100644 --- a/src/parser/transform/constraint/CMakeLists.txt +++ b/src/parser/transform/constraint/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_transformer_constraint OBJECT transform_constraint.cpp) +add_library(duckdb_transformer_constraint OBJECT transform_constraint.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/parser/transform/expression/CMakeLists.txt b/src/parser/transform/expression/CMakeLists.txt index 11aa83970ff..b5ae59053d5 100644 --- a/src/parser/transform/expression/CMakeLists.txt +++ b/src/parser/transform/expression/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_transformer_expression +add_library(duckdb_transformer_expression OBJECT transform_bool_expr.cpp transform_case.cpp diff --git a/src/parser/transform/helpers/CMakeLists.txt b/src/parser/transform/helpers/CMakeLists.txt index a21d1367f0d..993e688f8b7 100644 --- a/src/parser/transform/helpers/CMakeLists.txt +++ b/src/parser/transform/helpers/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_transformer_helpers +add_library(duckdb_transformer_helpers OBJECT transform_alias.cpp transform_cte.cpp diff --git a/src/parser/transform/statement/CMakeLists.txt b/src/parser/transform/statement/CMakeLists.txt index c6b75fbf01a..90239222ec7 100644 --- a/src/parser/transform/statement/CMakeLists.txt +++ b/src/parser/transform/statement/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_transformer_statement +add_library(duckdb_transformer_statement OBJECT transform_alter_table.cpp transform_copy.cpp diff --git a/src/parser/transform/tableref/CMakeLists.txt b/src/parser/transform/tableref/CMakeLists.txt index 67b00e9a225..277993f76b1 100644 --- a/src/parser/transform/tableref/CMakeLists.txt +++ b/src/parser/transform/tableref/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_transformer_tableref +add_library(duckdb_transformer_tableref OBJECT transform_base_tableref.cpp transform_join.cpp diff --git a/src/planner/CMakeLists.txt b/src/planner/CMakeLists.txt index 5ccbc9fb62f..d3799e143ff 100644 --- a/src/planner/CMakeLists.txt +++ b/src/planner/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory(expression_binder) add_subdirectory(operator) add_subdirectory(subquery) -add_library_unity(duckdb_planner +add_library(duckdb_planner OBJECT expression_iterator.cpp expression.cpp diff --git a/src/planner/binder/expression/CMakeLists.txt b/src/planner/binder/expression/CMakeLists.txt index 9bf2d90415b..45119a50e99 100644 --- a/src/planner/binder/expression/CMakeLists.txt +++ b/src/planner/binder/expression/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_bind_expression +add_library(duckdb_bind_expression OBJECT bind_aggregate_expression.cpp bind_case_expression.cpp diff --git a/src/planner/binder/query_node/CMakeLists.txt b/src/planner/binder/query_node/CMakeLists.txt index 0f238fcfd74..3cb9f19e3f0 100644 --- a/src/planner/binder/query_node/CMakeLists.txt +++ b/src/planner/binder/query_node/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_bind_query_node +add_library(duckdb_bind_query_node OBJECT bind_select_node.cpp bind_setop_node.cpp diff --git a/src/planner/binder/statement/CMakeLists.txt b/src/planner/binder/statement/CMakeLists.txt index de0623f45ea..47968779938 100644 --- a/src/planner/binder/statement/CMakeLists.txt +++ b/src/planner/binder/statement/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_bind_statement +add_library(duckdb_bind_statement OBJECT bind_copy.cpp bind_create.cpp diff --git a/src/planner/binder/tableref/CMakeLists.txt b/src/planner/binder/tableref/CMakeLists.txt index dd2d22d40a9..192f853f10d 100644 --- a/src/planner/binder/tableref/CMakeLists.txt +++ b/src/planner/binder/tableref/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_bind_tableref +add_library(duckdb_bind_tableref OBJECT bind_basetableref.cpp bind_crossproductref.cpp diff --git a/src/planner/expression/CMakeLists.txt b/src/planner/expression/CMakeLists.txt index 808fe6c5d87..3e22e4b4e40 100644 --- a/src/planner/expression/CMakeLists.txt +++ b/src/planner/expression/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_planner_expression +add_library(duckdb_planner_expression OBJECT bound_aggregate_expression.cpp bound_between_expression.cpp diff --git a/src/planner/expression_binder/CMakeLists.txt b/src/planner/expression_binder/CMakeLists.txt index 2ea61595137..4cbb2236a20 100644 --- a/src/planner/expression_binder/CMakeLists.txt +++ b/src/planner/expression_binder/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_expression_binders +add_library(duckdb_expression_binders OBJECT aggregate_binder.cpp alter_binder.cpp diff --git a/src/planner/operator/CMakeLists.txt b/src/planner/operator/CMakeLists.txt index 801abad051a..3fc871c8fa7 100644 --- a/src/planner/operator/CMakeLists.txt +++ b/src/planner/operator/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_planner_operator +add_library(duckdb_planner_operator OBJECT logical_aggregate.cpp logical_empty_result.cpp diff --git a/src/planner/subquery/CMakeLists.txt b/src/planner/subquery/CMakeLists.txt index bf3bf3fcd55..9ee2aa89b4b 100644 --- a/src/planner/subquery/CMakeLists.txt +++ b/src/planner/subquery/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_planner_subquery +add_library(duckdb_planner_subquery OBJECT flatten_dependent_join.cpp has_correlated_expressions.cpp diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt index 2c2eb5d31e2..ac45379f57f 100644 --- a/src/storage/CMakeLists.txt +++ b/src/storage/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(buffer) add_subdirectory(checkpoint) add_subdirectory(table) -add_library_unity(duckdb_storage +add_library(duckdb_storage OBJECT buffer_manager.cpp checkpoint_manager.cpp diff --git a/src/storage/buffer/CMakeLists.txt b/src/storage/buffer/CMakeLists.txt index 921073ef25b..62713523589 100644 --- a/src/storage/buffer/CMakeLists.txt +++ b/src/storage/buffer/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_storage_buffer +add_library(duckdb_storage_buffer OBJECT buffer_handle.cpp buffer_list.cpp diff --git a/src/storage/checkpoint/CMakeLists.txt b/src/storage/checkpoint/CMakeLists.txt index 5e1d121ed9c..d8b9fdb065e 100644 --- a/src/storage/checkpoint/CMakeLists.txt +++ b/src/storage/checkpoint/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_storage_checkpoint +add_library(duckdb_storage_checkpoint OBJECT table_data_writer.cpp table_data_reader.cpp) diff --git a/src/storage/table/CMakeLists.txt b/src/storage/table/CMakeLists.txt index 783a1d26db1..d2d42958e04 100644 --- a/src/storage/table/CMakeLists.txt +++ b/src/storage/table/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_storage_table +add_library(duckdb_storage_table OBJECT chunk_info.cpp column_segment.cpp diff --git a/src/transaction/CMakeLists.txt b/src/transaction/CMakeLists.txt index 7e72327bd68..718e04f68e9 100644 --- a/src/transaction/CMakeLists.txt +++ b/src/transaction/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(duckdb_transaction +add_library(duckdb_transaction OBJECT undo_buffer.cpp transaction_context.cpp diff --git a/test/api/CMakeLists.txt b/test/api/CMakeLists.txt index b1b264c0744..8475eb74618 100644 --- a/test/api/CMakeLists.txt +++ b/test/api/CMakeLists.txt @@ -1,5 +1,5 @@ if(NOT WIN32) - add_library_unity(test_api + add_library(test_api OBJECT test_api.cpp test_results.cpp @@ -11,7 +11,7 @@ if(NOT WIN32) test_query_profiler.cpp test_dbdir.cpp) else() - add_library_unity(test_api + add_library(test_api OBJECT test_api.cpp test_results.cpp diff --git a/test/appender/CMakeLists.txt b/test/appender/CMakeLists.txt index 1e1ab151f69..96095de8efb 100644 --- a/test/appender/CMakeLists.txt +++ b/test/appender/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_appender +add_library(test_appender OBJECT test_appender_abort.cpp test_appender.cpp diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt index e4c5eb32165..a0ffe32ce28 100644 --- a/test/common/CMakeLists.txt +++ b/test/common/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_common +add_library(test_common OBJECT test_cast.cpp test_checksum.cpp diff --git a/test/dbtransfer/CMakeLists.txt b/test/dbtransfer/CMakeLists.txt index e0349522f26..a6f4c06c635 100644 --- a/test/dbtransfer/CMakeLists.txt +++ b/test/dbtransfer/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_dbtransfer OBJECT test_dbtransfer.cpp) +add_library(test_dbtransfer OBJECT test_dbtransfer.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/monetdb/CMakeLists.txt b/test/monetdb/CMakeLists.txt index cbf624a34f5..b3bb9ddc57a 100644 --- a/test/monetdb/CMakeLists.txt +++ b/test/monetdb/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_monetdb +add_library(test_monetdb OBJECT test_leftjoin_bug.cpp test_many_views.cpp diff --git a/test/nested/CMakeLists.txt b/test/nested/CMakeLists.txt index d8063e92f2f..8cb30d04c0c 100644 --- a/test/nested/CMakeLists.txt +++ b/test/nested/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_nested OBJECT test_struct.cpp test_list.cpp) +add_library(test_nested OBJECT test_struct.cpp test_list.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/test/optimizer/CMakeLists.txt b/test/optimizer/CMakeLists.txt index ac43f1070ef..b251859286d 100644 --- a/test/optimizer/CMakeLists.txt +++ b/test/optimizer/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_optimizer +add_library(test_optimizer OBJECT test_arithmetic_simplification.cpp test_case_simplification.cpp diff --git a/test/parser/CMakeLists.txt b/test/parser/CMakeLists.txt index 1c598909946..5345f984c06 100644 --- a/test/parser/CMakeLists.txt +++ b/test/parser/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_parser OBJECT test_parser.cpp) +add_library(test_parser OBJECT test_parser.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/persistence/CMakeLists.txt b/test/persistence/CMakeLists.txt index feacb3f6ecc..e8506e76d47 100644 --- a/test/persistence/CMakeLists.txt +++ b/test/persistence/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_persistence +add_library(test_persistence OBJECT test_persistence.cpp test_locking.cpp diff --git a/test/planner/CMakeLists.txt b/test/planner/CMakeLists.txt index 5610da181eb..d08aac8bcc0 100644 --- a/test/planner/CMakeLists.txt +++ b/test/planner/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_planner OBJECT test_projection_binding.cpp) +add_library(test_planner OBJECT test_projection_binding.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/rigger/CMakeLists.txt b/test/rigger/CMakeLists.txt index 0bc50c18417..0c9a7995938 100644 --- a/test/rigger/CMakeLists.txt +++ b/test/rigger/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_rigger OBJECT test_rigger.cpp) +add_library(test_rigger OBJECT test_rigger.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sakila/CMakeLists.txt b/test/sakila/CMakeLists.txt index 36204d1b267..92c219f6a16 100644 --- a/test/sakila/CMakeLists.txt +++ b/test/sakila/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sakila OBJECT test_sakila.cpp) +add_library(test_sakila OBJECT test_sakila.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/aggregate/CMakeLists.txt b/test/sql/aggregate/CMakeLists.txt index 48e50658302..1c64321f7a4 100644 --- a/test/sql/aggregate/CMakeLists.txt +++ b/test/sql/aggregate/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_aggregate +add_library(test_sql_aggregate OBJECT test_aggregate.cpp test_aggregate_types.cpp) diff --git a/test/sql/alter/CMakeLists.txt b/test/sql/alter/CMakeLists.txt index 013534567e8..a7edf87a3eb 100644 --- a/test/sql/alter/CMakeLists.txt +++ b/test/sql/alter/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_alter +add_library(test_sql_alter OBJECT test_alter.cpp test_rename_table.cpp) diff --git a/test/sql/append/CMakeLists.txt b/test/sql/append/CMakeLists.txt index ee83418ea1a..ae172c61d15 100644 --- a/test/sql/append/CMakeLists.txt +++ b/test/sql/append/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_append OBJECT test_big_append.cpp) +add_library(test_sql_append OBJECT test_big_append.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/binder/CMakeLists.txt b/test/sql/binder/CMakeLists.txt index af8c8f5d4b8..73cee87d281 100644 --- a/test/sql/binder/CMakeLists.txt +++ b/test/sql/binder/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_binder OBJECT test_case_insensitive_binding.cpp) +add_library(test_sql_binder OBJECT test_case_insensitive_binding.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/blob/CMakeLists.txt b/test/sql/blob/CMakeLists.txt index cd1cb95653d..0f99541076d 100644 --- a/test/sql/blob/CMakeLists.txt +++ b/test/sql/blob/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_blob OBJECT test_blob.cpp) +add_library(test_sql_blob OBJECT test_blob.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/capi/CMakeLists.txt b/test/sql/capi/CMakeLists.txt index 73d7e4697dd..55510758a4c 100644 --- a/test/sql/capi/CMakeLists.txt +++ b/test/sql/capi/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_capi +add_library(test_sql_capi OBJECT test_capi.cpp test_starting_database.cpp) diff --git a/test/sql/cast/CMakeLists.txt b/test/sql/cast/CMakeLists.txt index e3e1e3004da..9560312ca53 100644 --- a/test/sql/cast/CMakeLists.txt +++ b/test/sql/cast/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_cast OBJECT test_boolean_cast.cpp test_string_cast.cpp) +add_library(test_sql_cast OBJECT test_boolean_cast.cpp test_string_cast.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/catalog/CMakeLists.txt b/test/sql/catalog/CMakeLists.txt index 308bbfa5eba..e154b709ce0 100644 --- a/test/sql/catalog/CMakeLists.txt +++ b/test/sql/catalog/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_catalog +add_library(test_sql_catalog OBJECT test_catalog_errors.cpp test_create_from_select.cpp diff --git a/test/sql/collate/CMakeLists.txt b/test/sql/collate/CMakeLists.txt index c11e7b82993..34e98dd6884 100644 --- a/test/sql/collate/CMakeLists.txt +++ b/test/sql/collate/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_collate +add_library(test_sql_collate OBJECT test_collate.cpp test_strip_accents.cpp) diff --git a/test/sql/constraints/CMakeLists.txt b/test/sql/constraints/CMakeLists.txt index d997ed40385..7a6b81a2805 100644 --- a/test/sql/constraints/CMakeLists.txt +++ b/test/sql/constraints/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_constraints +add_library(test_sql_constraints OBJECT test_check.cpp test_notnull.cpp diff --git a/test/sql/copy/CMakeLists.txt b/test/sql/copy/CMakeLists.txt index d9021f11eee..549414ddda8 100644 --- a/test/sql/copy/CMakeLists.txt +++ b/test/sql/copy/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_copy OBJECT test_copy.cpp test_csv_auto.cpp) +add_library(test_sql_copy OBJECT test_copy.cpp test_csv_auto.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/create/CMakeLists.txt b/test/sql/create/CMakeLists.txt index 798427c9610..b67b37d4d8a 100644 --- a/test/sql/create/CMakeLists.txt +++ b/test/sql/create/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_create OBJECT test_ifnotexists.cpp) +add_library(test_sql_create OBJECT test_ifnotexists.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/date/CMakeLists.txt b/test/sql/date/CMakeLists.txt index 34e1cb72c45..a7372a68c89 100644 --- a/test/sql/date/CMakeLists.txt +++ b/test/sql/date/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity( +add_library( test_sql_date OBJECT test_date.cpp diff --git a/test/sql/delete/CMakeLists.txt b/test/sql/delete/CMakeLists.txt index e6d770df386..8b863c1c5a9 100644 --- a/test/sql/delete/CMakeLists.txt +++ b/test/sql/delete/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_delete OBJECT test_delete.cpp) +add_library(test_sql_delete OBJECT test_delete.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/explain/CMakeLists.txt b/test/sql/explain/CMakeLists.txt index fa9b9eb88c0..b958c4ce61a 100644 --- a/test/sql/explain/CMakeLists.txt +++ b/test/sql/explain/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_explain OBJECT test_explain.cpp) +add_library(test_sql_explain OBJECT test_explain.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/filter/CMakeLists.txt b/test/sql/filter/CMakeLists.txt index e9876144c56..8b818b3a88f 100644 --- a/test/sql/filter/CMakeLists.txt +++ b/test/sql/filter/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_filter +add_library(test_sql_filter OBJECT test_alias_filter.cpp test_constant_comparisons.cpp diff --git a/test/sql/filter_pushdown/CMakeLists.txt b/test/sql/filter_pushdown/CMakeLists.txt index 61cd22c0bde..60bfe835244 100644 --- a/test/sql/filter_pushdown/CMakeLists.txt +++ b/test/sql/filter_pushdown/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_filter_pushdown OBJECT test_filter_pushdown.cpp) +add_library(test_filter_pushdown OBJECT test_filter_pushdown.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/function/CMakeLists.txt b/test/sql/function/CMakeLists.txt index 6aaac44550a..c0da9afd035 100644 --- a/test/sql/function/CMakeLists.txt +++ b/test/sql/function/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_function +add_library(test_sql_function OBJECT test_math.cpp test_concat.cpp diff --git a/test/sql/index/CMakeLists.txt b/test/sql/index/CMakeLists.txt index 99a727a1e55..4c20f0b3d04 100644 --- a/test/sql/index/CMakeLists.txt +++ b/test/sql/index/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_index +add_library(test_index OBJECT test_art_index.cpp test_art_keys.cpp diff --git a/test/sql/join/CMakeLists.txt b/test/sql/join/CMakeLists.txt index df5bfbe3708..f3ed0b9413c 100644 --- a/test/sql/join/CMakeLists.txt +++ b/test/sql/join/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_join +add_library(test_sql_join OBJECT test_join_on_aggregates.cpp test_left_outer_join.cpp diff --git a/test/sql/naughty/CMakeLists.txt b/test/sql/naughty/CMakeLists.txt index 7523f426cea..9378c635f65 100644 --- a/test/sql/naughty/CMakeLists.txt +++ b/test/sql/naughty/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_naughty OBJECT test_naughty_strings.cpp) +add_library(test_sql_naughty OBJECT test_naughty_strings.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/order/CMakeLists.txt b/test/sql/order/CMakeLists.txt index a2b7d32414a..9ef29b93781 100644 --- a/test/sql/order/CMakeLists.txt +++ b/test/sql/order/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_order +add_library(test_sql_order OBJECT test_order_same_value.cpp) set(ALL_OBJECT_FILES diff --git a/test/sql/parallelism/CMakeLists.txt b/test/sql/parallelism/CMakeLists.txt index a864666e008..3bc14b37701 100644 --- a/test/sql/parallelism/CMakeLists.txt +++ b/test/sql/parallelism/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_parallelism OBJECT test_simple_parallelism.cpp) +add_library(test_sql_parallelism OBJECT test_simple_parallelism.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/pragma/CMakeLists.txt b/test/sql/pragma/CMakeLists.txt index a8614f0de8c..1926d9fbe8d 100644 --- a/test/sql/pragma/CMakeLists.txt +++ b/test/sql/pragma/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_pragma +add_library(test_sql_pragma OBJECT test_pragma.cpp test_show_tables.cpp diff --git a/test/sql/prepared/CMakeLists.txt b/test/sql/prepared/CMakeLists.txt index 24a34b71079..7ecf20a5ce1 100644 --- a/test/sql/prepared/CMakeLists.txt +++ b/test/sql/prepared/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_prepared OBJECT test_prepared.cpp) +add_library(test_sql_prepared OBJECT test_prepared.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/schema/CMakeLists.txt b/test/sql/schema/CMakeLists.txt index aae713b7d7d..d9e07066f81 100644 --- a/test/sql/schema/CMakeLists.txt +++ b/test/sql/schema/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_schema OBJECT test_quoted_column_name.cpp) +add_library(test_sql_schema OBJECT test_quoted_column_name.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/setops/CMakeLists.txt b/test/sql/setops/CMakeLists.txt index 6a5c98df0de..47901a76040 100644 --- a/test/sql/setops/CMakeLists.txt +++ b/test/sql/setops/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_setops +add_library(test_sql_setops OBJECT test_joins_under_setops.cpp test_union.cpp) diff --git a/test/sql/simple/CMakeLists.txt b/test/sql/simple/CMakeLists.txt index f453d7c2ca8..d18bddbc7a7 100644 --- a/test/sql/simple/CMakeLists.txt +++ b/test/sql/simple/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_simple +add_library(test_sql_simple OBJECT test_arithmetic.cpp test_alias.cpp diff --git a/test/sql/storage/CMakeLists.txt b/test/sql/storage/CMakeLists.txt index 39190f6bff2..5b7a10f7aab 100644 --- a/test/sql/storage/CMakeLists.txt +++ b/test/sql/storage/CMakeLists.txt @@ -1,5 +1,5 @@ if(NOT WIN32 AND NOT SUN) - add_library_unity(test_sql_storage + add_library(test_sql_storage OBJECT test_buffer_manager.cpp test_constraints.cpp @@ -19,7 +19,7 @@ if(NOT WIN32 AND NOT SUN) test_storage_scan.cpp test_database_size.cpp) else() - add_library_unity(test_sql_storage + add_library(test_sql_storage OBJECT test_buffer_manager.cpp test_constraints.cpp diff --git a/test/sql/subquery/CMakeLists.txt b/test/sql/subquery/CMakeLists.txt index b91e063202e..51456c52742 100644 --- a/test/sql/subquery/CMakeLists.txt +++ b/test/sql/subquery/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_subquery +add_library(test_subquery OBJECT test_any_all.cpp test_correlated_subquery.cpp diff --git a/test/sql/tpcds/CMakeLists.txt b/test/sql/tpcds/CMakeLists.txt index 3198aa74715..5081c4d4466 100644 --- a/test/sql/tpcds/CMakeLists.txt +++ b/test/sql/tpcds/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(../../../third_party/dsdgen/include) -add_library_unity(test_sql_tpcds OBJECT test_tpcds.cpp) +add_library(test_sql_tpcds OBJECT test_tpcds.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/tpch/CMakeLists.txt b/test/sql/tpch/CMakeLists.txt index 9596f201c77..6ab741d27b0 100644 --- a/test/sql/tpch/CMakeLists.txt +++ b/test/sql/tpch/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_tpch +add_library(test_sql_tpch OBJECT test_tpch.cpp test_tpch_with_relations.cpp) diff --git a/test/sql/transactions/CMakeLists.txt b/test/sql/transactions/CMakeLists.txt index 1004250fead..bc0be1a24fb 100644 --- a/test/sql/transactions/CMakeLists.txt +++ b/test/sql/transactions/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_transaction +add_library(test_sql_transaction OBJECT test_concurrentappend.cpp test_big_transaction_abort.cpp diff --git a/test/sql/udf_function/CMakeLists.txt b/test/sql/udf_function/CMakeLists.txt index 39d5ef0de46..24166ed8d12 100644 --- a/test/sql/udf_function/CMakeLists.txt +++ b/test/sql/udf_function/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_udf_function +add_library(test_sql_udf_function OBJECT test_templated_udf_function.cpp test_argumented_udf_function.cpp) diff --git a/test/sql/update/CMakeLists.txt b/test/sql/update/CMakeLists.txt index b4164c522af..50c61765817 100644 --- a/test/sql/update/CMakeLists.txt +++ b/test/sql/update/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_update +add_library(test_sql_update OBJECT test_big_update.cpp test_null_update.cpp diff --git a/test/sql/varchar/CMakeLists.txt b/test/sql/varchar/CMakeLists.txt index 274bcacbd72..989c05da94f 100644 --- a/test/sql/varchar/CMakeLists.txt +++ b/test/sql/varchar/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_varchar OBJECT test_big_varchar.cpp) +add_library(test_sql_varchar OBJECT test_big_varchar.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sql/views/CMakeLists.txt b/test/sql/views/CMakeLists.txt index 754be47c399..134cfbf9ba3 100644 --- a/test/sql/views/CMakeLists.txt +++ b/test/sql/views/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_views OBJECT test_views.cpp) +add_library(test_sql_views OBJECT test_views.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sqlite/CMakeLists.txt b/test/sqlite/CMakeLists.txt index 7cc46e44511..5c9376ddd13 100644 --- a/test/sqlite/CMakeLists.txt +++ b/test/sqlite/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sqlite +add_library(test_sqlite OBJECT md5.cpp test_sqllogictest.cpp) diff --git a/test/sqlserver/CMakeLists.txt b/test/sqlserver/CMakeLists.txt index 64be6886036..f8ea7cc4756 100644 --- a/test/sqlserver/CMakeLists.txt +++ b/test/sqlserver/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sqlserver OBJECT test_sqlserver.cpp) +add_library(test_sqlserver OBJECT test_sqlserver.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/sqlsmith/CMakeLists.txt b/test/sqlsmith/CMakeLists.txt index 13f2cc69c9b..14b03355f0f 100644 --- a/test/sqlsmith/CMakeLists.txt +++ b/test/sqlsmith/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sqlsmith OBJECT test_sqlsmith.cpp) +add_library(test_sqlsmith OBJECT test_sqlsmith.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/test/tpce/CMakeLists.txt b/test/tpce/CMakeLists.txt index a615cfa6728..caf62bcd70b 100644 --- a/test/tpce/CMakeLists.txt +++ b/test/tpce/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library_unity(test_sql_tpce OBJECT test_tpce.cpp) +add_library(test_sql_tpce OBJECT test_tpce.cpp) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE)