diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-30 12:27:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-30 12:27:11 (GMT) |
| commit | 6152011cd0f98f05cd82a9e4316c730047952c58 (patch) | |
| tree | 2e25b129dc32d61fcf86d8c3c835b0a27fcd114b /Modules | |
| parent | 3595e37519eb2d357eda2de993cb03aaabbe3fa2 (diff) | |
| parent | 832858195ec4e9ac1ef513d7c2974d62a4f941c7 (diff) | |
| download | CMake-6152011cd0f98f05cd82a9e4316c730047952c58.zip CMake-6152011cd0f98f05cd82a9e4316c730047952c58.tar.gz CMake-6152011cd0f98f05cd82a9e4316c730047952c58.tar.bz2 | |
Merge topic 'GoogleTest-fix-generated-include'
832858195e GoogleTest: Fix include path in the generated file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5063
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GoogleTest.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index 2ef7382..057b29d 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -495,7 +495,7 @@ function(gtest_discover_tests TARGET) string(CONCAT ctest_include_content "if(EXISTS \"$<TARGET_FILE:${TARGET}>\")" "\n" " if(\"$<TARGET_FILE:${TARGET}>\" IS_NEWER_THAN \"${ctest_tests_file}\")" "\n" - " include(GoogleTestAddTests)" "\n" + " include(\"${_GOOGLETEST_DISCOVER_TESTS_SCRIPT}\")" "\n" " gtest_discover_tests_impl(" "\n" " TEST_EXECUTABLE" " [==[" "$<TARGET_FILE:${TARGET}>" "]==]" "\n" " TEST_EXECUTOR" " [==[" "${crosscompiling_emulator}" "]==]" "\n" |