From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qchar/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qhash/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qlist/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qmap/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qrect/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qset/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qstack/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qstring/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qvector/CMakeLists.txt | 2 +- 17 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 tests/benchmarks/corelib/tools/qchar/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qstring/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt (limited to 'tests/benchmarks/corelib/tools') diff --git a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt index d07794c25e..1e653fa98d 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_containers-associative Binary: ##################################################################### -qt_add_benchmark(tst_bench_containers-associative +qt_internal_add_benchmark(tst_bench_containers-associative SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt index 77e889160c..f8ebc69c29 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_containers-sequential Binary: ##################################################################### -qt_add_benchmark(tst_bench_containers-sequential +qt_internal_add_benchmark(tst_bench_containers-sequential SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt b/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt deleted file mode 100644 index c51e2a0059..0000000000 --- a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qchar SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt index 8d4bff5979..e683d60de2 100644 --- a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcontiguouscache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcontiguouscache +qt_internal_add_benchmark(tst_bench_qcontiguouscache SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt index 77168e443b..2ca8e683e1 100644 --- a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcryptographichash Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcryptographichash +qt_internal_add_benchmark(tst_bench_qcryptographichash SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt deleted file mode 100644 index 6875fdd613..0000000000 --- a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qdatetime SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt index 760b1848d7..5286484b0c 100644 --- a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_hash Binary: ##################################################################### -qt_add_benchmark(tst_hash +qt_internal_add_benchmark(tst_hash SOURCES main.cpp outofline.cpp diff --git a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt index 40be9e9374..46ca1c8514 100644 --- a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlist Binary: ##################################################################### -qt_add_benchmark(tst_bench_qlist +qt_internal_add_benchmark(tst_bench_qlist SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt deleted file mode 100644 index b8a23bc757..0000000000 --- a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qlocale SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt index b814b018c0..5937eda37c 100644 --- a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmap Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmap +qt_internal_add_benchmark(tst_bench_qmap SOURCES main.cpp INCLUDE_DIRECTORIES diff --git a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt index fd9ea5a6f2..30234c7055 100644 --- a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qrect Binary: ##################################################################### -qt_add_benchmark(tst_bench_qrect +qt_internal_add_benchmark(tst_bench_qrect SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt index fd10411ff3..63128f5f95 100644 --- a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qringbuffer Binary: ##################################################################### -qt_add_benchmark(tst_bench_qringbuffer +qt_internal_add_benchmark(tst_bench_qringbuffer SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt index 9627338414..00fd088776 100644 --- a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Binary: ##################################################################### -qt_add_benchmark(tst_qset +qt_internal_add_benchmark(tst_qset SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt index 2389dd51ce..4526af60db 100644 --- a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_stack Binary: ##################################################################### -qt_add_benchmark(tst_bench_stack +qt_internal_add_benchmark(tst_bench_stack SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt deleted file mode 100644 index 1dd6678e8e..0000000000 --- a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qstring SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt deleted file mode 100644 index 3947ae1c5e..0000000000 --- a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qtimezone SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt index ae40297604..467405eea0 100644 --- a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_vector Binary: ##################################################################### -qt_add_benchmark(tst_bench_vector +qt_internal_add_benchmark(tst_bench_vector SOURCES main.cpp outofline.cpp -- cgit v1.2.3