diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-07 14:20:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-07 14:20:43 (GMT) |
| commit | 256d532593e5f606377b6954456aa8e35533b411 (patch) | |
| tree | 7c6bb9eb35f158f1a5fd77f363a186606d3fe4b8 /Modules | |
| parent | 7693a8152dd4ad81ef36000e98f09e9de639c0df (diff) | |
| parent | 0767016eabf17ab124ae7b454b9ca910dcc17c56 (diff) | |
| download | CMake-256d532593e5f606377b6954456aa8e35533b411.zip CMake-256d532593e5f606377b6954456aa8e35533b411.tar.gz CMake-256d532593e5f606377b6954456aa8e35533b411.tar.bz2 | |
Merge topic 'GoogleTest-discovery-scope'
0767016eab GoogleTest: Avoid silent failures of dynamic test discovery
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9038
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GoogleTest.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index 57a7476..3c12e14 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -500,7 +500,7 @@ function(gtest_discover_tests TARGET) -D "CTEST_FILE=${ctest_tests_file}" -D "TEST_DISCOVERY_TIMEOUT=${_DISCOVERY_TIMEOUT}" -D "TEST_XML_OUTPUT_DIR=${_XML_OUTPUT_DIR}" - -P "${_GOOGLETEST_DISCOVER_TESTS_SCRIPT}" + -P "${CMAKE_ROOT}/Modules/GoogleTestAddTests.cmake" VERBATIM ) @@ -526,7 +526,7 @@ function(gtest_discover_tests TARGET) " if(NOT EXISTS \"${ctest_tests_file}\" OR" "\n" " NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"$<TARGET_FILE:${TARGET}>\" OR\n" " NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"\${CMAKE_CURRENT_LIST_FILE}\")\n" - " include(\"${_GOOGLETEST_DISCOVER_TESTS_SCRIPT}\")" "\n" + " include(\"${CMAKE_ROOT}/Modules/GoogleTestAddTests.cmake\")" "\n" " gtest_discover_tests_impl(" "\n" " TEST_EXECUTABLE" " [==[" "$<TARGET_FILE:${TARGET}>" "]==]" "\n" " TEST_EXECUTOR" " [==[" "${crosscompiling_emulator}" "]==]" "\n" @@ -573,9 +573,5 @@ endfunction() ############################################################################### -set(_GOOGLETEST_DISCOVER_TESTS_SCRIPT - ${CMAKE_CURRENT_LIST_DIR}/GoogleTestAddTests.cmake -) - # Restore project's policies cmake_policy(POP) |