Subject: [PATCH] Make RunCMake compatible with downstream projects --- 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 5201a6f8063d7be8fee3d9cd01e7c5e195869467) +++ b/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake (revision 27aa47b3c906dbe263f23ff4abbdb535b504404f) @@ -3,6 +3,8 @@ # # Original file location was Tests/RunCMake/CMakeLists.txt +set(RunCMakeDir ${CMAKE_CURRENT_LIST_DIR}) + macro(add_RunCMake_test test) set(TEST_ARGS ${ARGN}) if ("${ARGV1}" STREQUAL "TEST_DIR") @@ -18,8 +20,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "LCC") list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1) endif() - add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND} - -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR} + add_test(NAME RunCMake.${test} COMMAND ${CMAKE_COMMAND} + -DCMAKE_MODULE_PATH=${RunCMakeDir} -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig} -DRunCMake_GENERATOR=${CMAKE_GENERATOR} -DRunCMake_GENERATOR_INSTANCE=${CMAKE_GENERATOR_INSTANCE} Index: src/testinternal/3rdparty/cmake/RunCMake.cmake IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/testinternal/3rdparty/cmake/RunCMake.cmake b/src/testinternal/3rdparty/cmake/RunCMake.cmake --- a/src/testinternal/3rdparty/cmake/RunCMake.cmake (revision 5201a6f8063d7be8fee3d9cd01e7c5e195869467) +++ b/src/testinternal/3rdparty/cmake/RunCMake.cmake (revision 27aa47b3c906dbe263f23ff4abbdb535b504404f) @@ -1,5 +1,7 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. +# +# Original file location was Tests/RunCMake/RunCMake.cmake foreach( arg