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

Propagate _Qt6CTestMacros in RunCMake

Browse Source 
Propagate the `_Qt6CTestMacros` variable so that
`_qt_internal_get_cmake_test_configure_options` can be used
inside the RunCMake tests

Pick-to: 6.8
Change-Id: I2b7f3996315169d840bab3dff011927288c9782d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 00a96237fd8b40c42744d41c6d545a140c816dee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6375c935a5cf59ee41c95534e11c79681c2bdc16)
This commit is contained in:
Cristian Le 2025-05-12 17:00:23 +02:00 committed by Qt Cherry-pick Bot
parent 4e482b0552
commit 04b40129e7
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake vendored
View File

@ -20,6 +20,10 @@ macro(add_RunCMake_test test)
if(CMAKE_C_COMPILER_ID STREQUAL "LCC") if(CMAKE_C_COMPILER_ID STREQUAL "LCC")
list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1) list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1)
endif() endif()
# Qt specific options
list(APPEND TEST_ARGS
-D_Qt6CTestMacros=${_Qt6CTestMacros}
)
add_test(NAME RunCMake.${test} COMMAND ${CMAKE_COMMAND} add_test(NAME RunCMake.${test} COMMAND ${CMAKE_COMMAND}
-DCMAKE_MODULE_PATH=${RunCMakeDir} -DCMAKE_MODULE_PATH=${RunCMakeDir}
-DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig} -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig}

19
src/testinternal/3rdparty/cmake/patches/0004-Propagate-_Qt6CTestMacros.patch vendored Normal file
View File

@ -0,0 +1,19 @@
Index: src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake b/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
--- a/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake (revision b23da37d71bde4673fab3510596514e4ac451053)
+++ b/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake (revision e71805860401b494ab3b6e1c12eaa1c84fd89994)
@@ -20,6 +20,10 @@
if(CMAKE_C_COMPILER_ID STREQUAL "LCC")
list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1)
endif()
+ # Qt specific options
+ list(APPEND TEST_ARGS
+ -D_Qt6CTestMacros=${_Qt6CTestMacros}
+ )
add_test(NAME RunCMake.${test} COMMAND ${CMAKE_COMMAND}
-DCMAKE_MODULE_PATH=${RunCMakeDir}
-DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig}