diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-04 12:33:34 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-06 20:05:15 +0200 |
| commit | 791eeb6ff1847d403814bdee9535381dd6041d8a (patch) | |
| tree | e303593c0ed907f235fa1a75a8d9507a47eeadd2 | |
| parent | 84a1cc9fb76269521456d09abab65c402cf481b7 (diff) | |
CMake: Prepare for removal of Threads::Threads special cases
The Threads::Threads target will automatically be propagated via the
Qt6::Platform target.
Task-number: QTBUG-85877
Change-Id: I33aec0b393be82467970eefd69f31feda3ac996e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| -rw-r--r-- | tests/auto/qml/qjsengine/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/qml/qjsvalue/CMakeLists.txt | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt index 49cba69620..3fc68ba163 100644 --- a/tests/auto/qml/qjsengine/CMakeLists.txt +++ b/tests/auto/qml/qjsengine/CMakeLists.txt @@ -10,7 +10,12 @@ file(GLOB_RECURSE test_data_glob script/*) list(APPEND test_data ${test_data_glob}) -qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) # special case +# special case begin +# TODO: Prepare for removal, once Platform brings in Threads. +if(NOT TARGET Threads::Threads) + qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) +endif() +# special case end qt_add_test(tst_qjsengine SOURCES diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt index 0c466ef874..06b43709d9 100644 --- a/tests/auto/qml/qjsvalue/CMakeLists.txt +++ b/tests/auto/qml/qjsvalue/CMakeLists.txt @@ -4,7 +4,12 @@ ## tst_qjsvalue Test: ##################################################################### -qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) # special case +# special case begin +# TODO: Prepare for removal, once Platform brings in Threads. +if(NOT TARGET Threads::Threads) + qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) +endif() +# special case end qt_add_test(tst_qjsvalue SOURCES |