From db397d11130639abae1b1438b0685db2c75db330 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 7 Jul 2020 18:34:17 +0200 Subject: CMake: Regenerate subdir test projects And generate a few more test projects that were missing. Change-Id: I5df51106549aa5ae09bc3c42360e14b143719547 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt | 4 ++++ tests/auto/corelib/global/qlogging/CMakeLists.txt | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt (limited to 'tests/auto/corelib/global/qlogging') 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 -- cgit v1.2.3