diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-17 13:44:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-17 13:44:28 (GMT) |
| commit | ed9b971694b36d3001c0b68444819599270831b5 (patch) | |
| tree | 0753fbe4da0f5affe5d6d2bd1b0465dcf99ad27a /Modules | |
| parent | 40ae5658326f9069aae6c8da061674c485ad7ee3 (diff) | |
| parent | 1bf6d5979d7fceae8b8a32129b5816bae459fb96 (diff) | |
| download | CMake-ed9b971694b36d3001c0b68444819599270831b5.zip CMake-ed9b971694b36d3001c0b68444819599270831b5.tar.gz CMake-ed9b971694b36d3001c0b68444819599270831b5.tar.bz2 | |
Merge topic 'gtest_discover_tests-PRE_TEST-dep' into release-3.22
1bf6d5979d gtest_discover_tests: Re-run PRE_TEST discovery on any arg change
715af43124 Tests: Fix and update wrongly named GoogleTest stdout file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6728
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GoogleTest.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index efc33e3..f5f4f02 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -516,7 +516,8 @@ function(gtest_discover_tests TARGET) string(CONCAT ctest_include_content "if(EXISTS \"$<TARGET_FILE:${TARGET}>\")" "\n" " if(NOT EXISTS \"${ctest_tests_file}\" OR" "\n" - " NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"$<TARGET_FILE:${TARGET}>\")" "\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" " gtest_discover_tests_impl(" "\n" " TEST_EXECUTABLE" " [==[" "$<TARGET_FILE:${TARGET}>" "]==]" "\n" |