diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:34:17 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:39 +0200 |
| commit | db397d11130639abae1b1438b0685db2c75db330 (patch) | |
| tree | a97939cbefc3779e8a3e1ff339ad37f17806a8d7 /tests/auto/corelib/global | |
| parent | e9a328bc0e56b429a370b13c8e0b4790916cebde (diff) | |
CMake: Regenerate subdir test projects
And generate a few more test projects that were missing.
Change-Id: I5df51106549aa5ae09bc3c42360e14b143719547
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib/global')
4 files changed, 33 insertions, 9 deletions
diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt index 58e083d665..8f1a8171ea 100644 --- a/tests/auto/corelib/global/CMakeLists.txt +++ b/tests/auto/corelib/global/CMakeLists.txt @@ -1,12 +1,17 @@ -add_subdirectory(q_func_info) +# Generated from global.pro. + add_subdirectory(qflags) -add_subdirectory(qfloat16) +add_subdirectory(q_func_info) add_subdirectory(qgetputenv) -add_subdirectory(qglobalstatic) -add_subdirectory(qhooks) -add_subdirectory(qlogging) +add_subdirectory(qglobal) add_subdirectory(qnumeric) +add_subdirectory(qfloat16) add_subdirectory(qrand) add_subdirectory(qrandomgenerator) +add_subdirectory(qlogging) add_subdirectory(qtendian) - +add_subdirectory(qglobalstatic) +add_subdirectory(qhooks) +if(WIN32) + add_subdirectory(qwinregistry) +endif() diff --git a/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c95195c71e --- /dev/null +++ b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from qlogging.pro. + +add_subdirectory(app) +add_subdirectory(test) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index ce9235f91e..e47f62776d 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -1,11 +1,14 @@ -add_qt_executable(qlogging_helper +# Generated from qlogging.pro. +# This file is almost completely custom written # special case + +qt_add_executable(qlogging_helper NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES app/main.cpp DEFINES QT_MESSAGELOGCONTEXT LIBRARIES Qt::Core) -#special case begin +# special case begin # Fixes required for the backtrace stack to be correct if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW) target_link_options(qlogging_helper PRIVATE -rdynamic) @@ -13,7 +16,7 @@ endif() set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default) # special case end -add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp +qt_add_test(tst_qlogging SOURCES tst_qlogging.cpp DEFINES QT_MESSAGELOGCONTEXT QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt new file mode 100644 index 0000000000..fc88750c9c --- /dev/null +++ b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qwinregistry.pro. + +##################################################################### +## tst_qwinregistry Test: +##################################################################### + +qt_add_test(tst_qwinregistry + SOURCES + tst_qwinregistry.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate +) |