From 1718948ed493cd5306e681c21a1c2f8e22b096f4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 7 Jul 2020 17:25:24 +0200 Subject: CMake: Regenerate benchmarks Change-Id: I4154d9ebb8303338a07350b655c7b468751efd10 Reviewed-by: Joerg Bornemann --- tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/io/qfile/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt | 2 +- .../corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt | 2 +- .../corelib/io/qprocess/testProcessLoopback/CMakeLists.txt | 3 +-- tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qurl/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/json/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/events/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt | 2 +- .../corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt | 2 +- .../corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt | 2 +- tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qchar/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qlocale/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qregexp/CMakeLists.txt | 8 ++++---- tests/benchmarks/corelib/text/qstring/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt | 2 +- tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt | 2 +- tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt | 2 +- tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt | 2 +- tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt | 2 +- tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt | 2 +- tests/benchmarks/corelib/time/qdate/CMakeLists.txt | 2 +- tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt | 2 +- tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt | 2 +- .../corelib/tools/containers-associative/CMakeLists.txt | 2 +- .../benchmarks/corelib/tools/containers-sequential/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qhash/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qlist/CMakeLists.txt | 2 +- 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/qvector/CMakeLists.txt | 2 +- 51 files changed, 59 insertions(+), 60 deletions(-) (limited to 'tests/benchmarks/corelib') diff --git a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt index 51f603b595..255befd99a 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdir_10000 Binary: ##################################################################### -add_qt_benchmark(tst_bench_qdir_10000 +qt_add_benchmark(tst_bench_qdir_10000 SOURCES bench_qdir_10000.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt index e3102a3389..1ea925928d 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt @@ -4,7 +4,7 @@ ## bench_qdir_tree Binary: ##################################################################### -add_qt_benchmark(bench_qdir_tree +qt_add_benchmark(bench_qdir_tree SOURCES bench_qdir_tree.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(bench_qdir_tree_resource_files "4.6.0-list.txt" ) -add_qt_resource(bench_qdir_tree "bench_qdir_tree" +qt_add_resource(bench_qdir_tree "bench_qdir_tree" PREFIX "/" FILES diff --git a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt index b1e86861b6..b534df5796 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdiriterator Binary: ##################################################################### -add_qt_benchmark(tst_bench_qdiriterator +qt_add_benchmark(tst_bench_qdiriterator SOURCES main.cpp qfilesystemiterator.cpp qfilesystemiterator.h @@ -15,7 +15,7 @@ add_qt_benchmark(tst_bench_qdiriterator ## Scopes: ##################################################################### -extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9)) +qt_extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9)) LINK_OPTIONS "-lstdc++fs" ) diff --git a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt index 7d1e19d75a..df33c1169f 100644 --- a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfile Binary: ##################################################################### -add_qt_benchmark(tst_bench_qfile +qt_add_benchmark(tst_bench_qfile SOURCES main.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ add_qt_benchmark(tst_bench_qfile ## Scopes: ##################################################################### -extend_target(tst_bench_qfile CONDITION WIN32 +qt_extend_target(tst_bench_qfile CONDITION WIN32 DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt index 195419f52e..691c3fb51d 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfileinfo Binary: ##################################################################### -add_qt_benchmark(tst_bench_qfileinfo +qt_add_benchmark(tst_bench_qfileinfo SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt index 7663bdb99d..21052a584c 100644 --- a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qiodevice Binary: ##################################################################### -add_qt_benchmark(tst_bench_qiodevice +qt_add_benchmark(tst_bench_qiodevice SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt index 00bbe74c2d..93cca1827f 100644 --- a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qprocess Binary: ##################################################################### -add_qt_benchmark(tst_bench_qprocess +qt_add_benchmark(tst_bench_qprocess SOURCES ../tst_bench_qprocess.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt index 59806127fe..6c67fdbbed 100644 --- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessLoopback Binary: ##################################################################### -add_qt_executable(testProcessLoopback +add_qt_benchmark(testProcessLoopback OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt index b5a7fe83f5..0d0115f785 100644 --- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt @@ -4,8 +4,7 @@ ## testProcessLoopback Binary: ##################################################################### -# add_qt_executable(testProcessLoopback # special case -add_qt_benchmark(testProcessLoopback # special case +qt_add_benchmark(testProcessLoopback OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt index 82b885bb17..b9bc9164a7 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtemporaryfile Binary: ##################################################################### -add_qt_benchmark(tst_bench_qtemporaryfile +qt_add_benchmark(tst_bench_qtemporaryfile SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt index 6dd11f1bbb..d84ba59f41 100644 --- a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtextstream Binary: ##################################################################### -add_qt_benchmark(tst_bench_qtextstream +qt_add_benchmark(tst_bench_qtextstream SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt index 26d98b7eb4..77ede07536 100644 --- a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qurl Binary: ##################################################################### -add_qt_benchmark(tst_qurl +qt_add_benchmark(tst_qurl SOURCES main.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ add_qt_benchmark(tst_qurl ## Scopes: ##################################################################### -extend_target(tst_qurl CONDITION WIN32 +qt_extend_target(tst_qurl CONDITION WIN32 DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/tests/benchmarks/corelib/json/CMakeLists.txt b/tests/benchmarks/corelib/json/CMakeLists.txt index 312cae8a45..2f81190182 100644 --- a/tests/benchmarks/corelib/json/CMakeLists.txt +++ b/tests/benchmarks/corelib/json/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtbinaryjson Binary: ##################################################################### -add_qt_benchmark(tst_bench_qtbinaryjson +qt_add_benchmark(tst_bench_qtbinaryjson SOURCES tst_bench_qtbinaryjson.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt index 1e35891126..e9c5cc694a 100644 --- a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_events Binary: ##################################################################### -add_qt_benchmark(tst_bench_events +qt_add_benchmark(tst_bench_events SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt index 173b3b9077..c0d0562869 100644 --- a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcoreapplication Binary: ##################################################################### -add_qt_benchmark(tst_bench_qcoreapplication +qt_add_benchmark(tst_bench_qcoreapplication SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt index e6da0721d3..8f7dd52376 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmetaobject Binary: ##################################################################### -add_qt_benchmark(tst_bench_qmetaobject +qt_add_benchmark(tst_bench_qmetaobject SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt index 00ca47aadc..ad63d9d8c8 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmetatype Binary: ##################################################################### -add_qt_benchmark(tst_bench_qmetatype +qt_add_benchmark(tst_bench_qmetatype SOURCES tst_qmetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt index 4644708b54..92cffc2980 100644 --- a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qobject Binary: ##################################################################### -add_qt_benchmark(tst_bench_qobject +qt_add_benchmark(tst_bench_qobject SOURCES main.cpp object.cpp object.h diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt index 4160fe7e36..2619d89779 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtimer_vs_qmetaobject Binary: ##################################################################### -add_qt_benchmark(qtimer_vs_qmetaobject +qt_add_benchmark(qtimer_vs_qmetaobject SOURCES tst_qtimer_vs_qmetaobject.cpp INCLUDE_DIRECTORIES diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt index c76c4dca18..4dfba51735 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtimer_vs_qmetaobject Binary: ##################################################################### -add_qt_benchmark(qtimer_vs_qmetaobject +qt_add_benchmark(qtimer_vs_qmetaobject SOURCES tst_qtimer_vs_qmetaobject.cpp INCLUDE_DIRECTORIES diff --git a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt index 5e5230566d..f5104b11ff 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qvariant Binary: ##################################################################### -add_qt_benchmark(tst_bench_qvariant +qt_add_benchmark(tst_bench_qvariant SOURCES tst_qvariant.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ add_qt_benchmark(tst_bench_qvariant ## Scopes: ##################################################################### -extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui +qt_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui PUBLIC_LIBRARIES # Remove: gui ) diff --git a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt index 7d6b6dc4f8..7f4ce4df13 100644 --- a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt +++ b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmimedatabase Binary: ##################################################################### -add_qt_benchmark(tst_bench_qmimedatabase +qt_add_benchmark(tst_bench_qmimedatabase SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt index 2251914957..3f8b26c883 100644 --- a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt +++ b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_quuid Binary: ##################################################################### -add_qt_benchmark(tst_bench_quuid +qt_add_benchmark(tst_bench_quuid SOURCES tst_quuid.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt index 9c7fae62eb..cdae659c92 100644 --- a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qbytearray Binary: ##################################################################### -add_qt_benchmark(tst_bench_qbytearray +qt_add_benchmark(tst_bench_qbytearray SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt index ba99813d2b..af45da6bfa 100644 --- a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qchar Binary: ##################################################################### -add_qt_benchmark(tst_bench_qchar +qt_add_benchmark(tst_bench_qchar SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt index 7e67472013..830c6dbf12 100644 --- a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlocale Binary: ##################################################################### -add_qt_benchmark(tst_bench_qlocale +qt_add_benchmark(tst_bench_qlocale SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt b/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt index e1dcd5c131..1646f4778a 100644 --- a/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qregexp Binary: ##################################################################### -add_qt_benchmark(tst_bench_qregexp +qt_add_benchmark(tst_bench_qregexp EXCEPTIONS SOURCES main.cpp @@ -17,7 +17,7 @@ set(qregexp_resource_files "main.cpp" ) -add_qt_resource(tst_bench_qregexp "qregexp" +qt_add_resource(tst_bench_qregexp "qregexp" PREFIX "/" FILES @@ -31,14 +31,14 @@ add_qt_resource(tst_bench_qregexp "qregexp" ## Scopes: ##################################################################### -extend_target(tst_bench_qregexp CONDITION TARGET Qt::Script AND NOT pcre +qt_extend_target(tst_bench_qregexp CONDITION TARGET Qt::Script AND NOT pcre DEFINES HAVE_JSC PUBLIC_LIBRARIES Qt::Script ) -extend_target(tst_bench_qregexp CONDITION (NOT QNX) AND (EXISTS _ss_[QT_SYSROOT]/usr/include/boost/regex.hpp) +qt_extend_target(tst_bench_qregexp CONDITION (NOT QNX) AND (EXISTS _ss_[QT_SYSROOT]/usr/include/boost/regex.hpp) DEFINES HAVE_BOOST PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt index 2999cb4682..e0f3a0e279 100644 --- a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstring Binary: ##################################################################### -add_qt_benchmark(tst_bench_qstring +qt_add_benchmark(tst_bench_qstring SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt index e326414d7a..3182c3faaa 100644 --- a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstringbuilder Binary: ##################################################################### -add_qt_benchmark(tst_bench_qstringbuilder +qt_add_benchmark(tst_bench_qstringbuilder SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt index a341f1aaa8..f62b4a82a1 100644 --- a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstringlist Binary: ##################################################################### -add_qt_benchmark(tst_bench_qstringlist +qt_add_benchmark(tst_bench_qstringlist SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt index 71226282ab..4ba55034d8 100644 --- a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmutex Binary: ##################################################################### -add_qt_benchmark(tst_bench_qmutex +qt_add_benchmark(tst_bench_qmutex SOURCES tst_qmutex.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt index d582dba8db..228f589e08 100644 --- a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qreadwritelock Binary: ##################################################################### -add_qt_benchmark(tst_bench_qreadwritelock +qt_add_benchmark(tst_bench_qreadwritelock SOURCES tst_qreadwritelock.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt index 00dbc9c298..fef77ff03c 100644 --- a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qthreadpool Binary: ##################################################################### -add_qt_benchmark(tst_bench_qthreadpool +qt_add_benchmark(tst_bench_qthreadpool SOURCES tst_qthreadpool.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt index ed60ec4495..45e8c92c38 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qthreadstorage Binary: ##################################################################### -add_qt_benchmark(tst_bench_qthreadstorage +qt_add_benchmark(tst_bench_qthreadstorage SOURCES tst_qthreadstorage.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt index 4de82d7cc9..d686746e58 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qwaitcondition Binary: ##################################################################### -add_qt_benchmark(tst_bench_qwaitcondition +qt_add_benchmark(tst_bench_qwaitcondition SOURCES tst_qwaitcondition.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt index 7ae18a42f5..2a70ef5f4f 100644 --- a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdate Binary: ##################################################################### -add_qt_benchmark(tst_bench_qdate +qt_add_benchmark(tst_bench_qdate SOURCES tst_bench_qdate.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt index b44f1a5bfc..6abe0035c7 100644 --- a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdatetime Binary: ##################################################################### -add_qt_benchmark(tst_bench_qdatetime +qt_add_benchmark(tst_bench_qdatetime SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt index 60e8ceba13..b4836337bc 100644 --- a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtimezone Binary: ##################################################################### -add_qt_benchmark(tst_bench_qtimezone +qt_add_benchmark(tst_bench_qtimezone SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt index 0e2dace380..d07794c25e 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: ##################################################################### -add_qt_benchmark(tst_bench_containers-associative +qt_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 40f455752e..77e889160c 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: ##################################################################### -add_qt_benchmark(tst_bench_containers-sequential +qt_add_benchmark(tst_bench_containers-sequential SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt b/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt index 99c6a7061d..949dda2167 100644 --- a/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qalgorithms Binary: ##################################################################### -add_qt_benchmark(tst_bench_qalgorithms +qt_add_benchmark(tst_bench_qalgorithms SOURCES tst_qalgorithms.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt index 126c0e7a50..8d4bff5979 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: ##################################################################### -add_qt_benchmark(tst_bench_qcontiguouscache +qt_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 1400027c1f..77168e443b 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: ##################################################################### -add_qt_benchmark(tst_bench_qcryptographichash +qt_add_benchmark(tst_bench_qcryptographichash SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt index 5b3a0fe5f5..760b1848d7 100644 --- a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_hash Binary: ##################################################################### -add_qt_benchmark(tst_hash +qt_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 ba40760910..40be9e9374 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: ##################################################################### -add_qt_benchmark(tst_bench_qlist +qt_add_benchmark(tst_bench_qlist SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt index a98c7d7157..b814b018c0 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: ##################################################################### -add_qt_benchmark(tst_bench_qmap +qt_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 4218092a88..fd9ea5a6f2 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: ##################################################################### -add_qt_benchmark(tst_bench_qrect +qt_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 e0323b90db..fd10411ff3 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: ##################################################################### -add_qt_benchmark(tst_bench_qringbuffer +qt_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 40ee622f89..9627338414 100644 --- a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Binary: ##################################################################### -add_qt_benchmark(tst_qset +qt_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 530d55b19b..2389dd51ce 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: ##################################################################### -add_qt_benchmark(tst_bench_stack +qt_add_benchmark(tst_bench_stack SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt index 0cc9b24236..ae40297604 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: ##################################################################### -add_qt_benchmark(tst_bench_vector +qt_add_benchmark(tst_bench_vector SOURCES main.cpp outofline.cpp -- cgit v1.2.3