From b3b2c799f84381a568ff5f6093dbee9ccbb48441 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 3 Oct 2019 13:15:44 +0200 Subject: [PATCH] cmake: add tests in corelib/time Change-Id: Idcd5d1be7503b50a43954c1b209e48a32cc8eaa9 Reviewed-by: Edward Welbourne Reviewed-by: Alexandru Croitor --- tests/auto/corelib/time/CMakeLists.txt | 2 ++ tests/auto/corelib/time/qdate/CMakeLists.txt | 3 --- .../corelib/time/qdatetime/CMakeLists.txt | 26 ++++++++++++++++++ tests/auto/corelib/time/qtime/CMakeLists.txt | 11 +++++++- .../corelib/time/qtimezone/CMakeLists.txt | 27 +++++++++++++++++++ 5 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 tests/auto/corelib/time/qdatetime/CMakeLists.txt create mode 100644 tests/auto/corelib/time/qtimezone/CMakeLists.txt diff --git a/tests/auto/corelib/time/CMakeLists.txt b/tests/auto/corelib/time/CMakeLists.txt index 733f75b8af6..fa73fc03fe9 100644 --- a/tests/auto/corelib/time/CMakeLists.txt +++ b/tests/auto/corelib/time/CMakeLists.txt @@ -1,4 +1,6 @@ # Generated from time.pro. add_subdirectory(qdate) +add_subdirectory(qdatetime) add_subdirectory(qtime) +add_subdirectory(qtimezone) diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt index 8514c915adf..9a90956bd6b 100644 --- a/tests/auto/corelib/time/qdate/CMakeLists.txt +++ b/tests/auto/corelib/time/qdate/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(tst_qdate LIBRARIES Qt::CorePrivate ) - -#### Keys ignored in scope 1:.:.:qdate.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt new file mode 100644 index 00000000000..b215ca6efad --- /dev/null +++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from qdatetime.pro. + +##################################################################### +## tst_qdatetime Test: +##################################################################### + +add_qt_test(tst_qdatetime + SOURCES + tst_qdatetime.cpp + LIBRARIES + Qt::CorePrivate +) + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qdatetime.pro:MSVC: +# QMAKE_CFLAGS_RELEASE = "--O1" +# QMAKE_CXXFLAGS_RELEASE = "--O1" + +extend_target(tst_qdatetime CONDITION APPLE + SOURCES + tst_qdatetime_mac.mm + PUBLIC_LIBRARIES + ${FWFoundation} +) diff --git a/tests/auto/corelib/time/qtime/CMakeLists.txt b/tests/auto/corelib/time/qtime/CMakeLists.txt index 0b8b4c81f37..ef224b45e32 100644 --- a/tests/auto/corelib/time/qtime/CMakeLists.txt +++ b/tests/auto/corelib/time/qtime/CMakeLists.txt @@ -1 +1,10 @@ -add_qt_test(tst_qtime SOURCES tst_qtime.cpp) +# Generated from qtime.pro. + +##################################################################### +## tst_qtime Test: +##################################################################### + +add_qt_test(tst_qtime + SOURCES + tst_qtime.cpp +) diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt new file mode 100644 index 00000000000..7d9a8ccc88a --- /dev/null +++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from qtimezone.pro. + +##################################################################### +## tst_qtimezone Test: +##################################################################### + +add_qt_test(tst_qtimezone + SOURCES + tst_qtimezone.cpp + LIBRARIES + Qt::CorePrivate +) + +## Scopes: +##################################################################### + +extend_target(tst_qtimezone CONDITION QT_FEATURE_icu + LIBRARIES + ICU::i18n ICU::uc ICU::data +) + +extend_target(tst_qtimezone CONDITION APPLE + SOURCES + tst_qtimezone_darwin.mm + PUBLIC_LIBRARIES + ${FWFoundation} +)