1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only set the deprecation define once for test batch

Browse Source 
Change-Id: I215f7a0dbb0078be9fdeadb1f941304071a575fa
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Mikolaj Boc 2023-01-05 14:55:20 +01:00
parent fdeaf3054c
commit 5c98ffdfef
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtTestHelpers.cmake
View File

@ -284,6 +284,7 @@ function(qt_internal_add_test_to_batch batch_name name)
# Lazy-init the test batch # Lazy-init the test batch
if(NOT TARGET ${target}) if(NOT TARGET ${target})
qt_internal_library_deprecation_level(deprecation_define)
qt_internal_add_executable(${target} qt_internal_add_executable(${target}
${exceptions_text} ${exceptions_text}
${gui_text} ${gui_text}
@ -291,7 +292,7 @@ function(qt_internal_add_test_to_batch batch_name name)
NO_INSTALL NO_INSTALL
OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/build_dir" OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/build_dir"
SOURCES "${QT_CMAKE_DIR}/qbatchedtestrunner.in.cpp" SOURCES "${QT_CMAKE_DIR}/qbatchedtestrunner.in.cpp"
DEFINES QTEST_BATCH_TESTS DEFINES QTEST_BATCH_TESTS ${deprecation_define}
INCLUDE_DIRECTORIES ${private_includes} INCLUDE_DIRECTORIES ${private_includes}
LIBRARIES ${QT_CMAKE_EXPORT_NAMESPACE}::Core LIBRARIES ${QT_CMAKE_EXPORT_NAMESPACE}::Core
${QT_CMAKE_EXPORT_NAMESPACE}::Test ${QT_CMAKE_EXPORT_NAMESPACE}::Test
@ -345,8 +346,6 @@ function(qt_internal_add_test_to_batch batch_name name)
list(PREPEND batched_test_list ${name}) list(PREPEND batched_test_list ${name})
set_property(GLOBAL PROPERTY _qt_batched_test_list_property ${batched_test_list}) set_property(GLOBAL PROPERTY _qt_batched_test_list_property ${batched_test_list})
qt_internal_library_deprecation_level(deprecation_define)
# Merge the current test with the rest of the batch # Merge the current test with the rest of the batch
qt_internal_extend_target(${target} qt_internal_extend_target(${target}
INCLUDE_DIRECTORIES ${arg_INCLUDE_DIRECTORIES} INCLUDE_DIRECTORIES ${arg_INCLUDE_DIRECTORIES}
@ -355,7 +354,6 @@ function(qt_internal_add_test_to_batch batch_name name)
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
DEFINES DEFINES
${arg_DEFINES} ${arg_DEFINES}
${deprecation_define}
COMPILE_OPTIONS ${arg_COMPILE_OPTIONS} COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
COMPILE_FLAGS ${arg_COMPILE_FLAGS} COMPILE_FLAGS ${arg_COMPILE_FLAGS}
LINK_OPTIONS ${arg_LINK_OPTIONS} LINK_OPTIONS ${arg_LINK_OPTIONS}