diff options
| author | Adam Badura <adam.f.badura@gmail.com> | 2020-07-26 08:19:02 (GMT) |
|---|---|---|
| committer | Adam Badura <adam.f.badura@gmail.com> | 2020-07-28 21:49:20 (GMT) |
| commit | 832858195ec4e9ac1ef513d7c2974d62a4f941c7 (patch) | |
| tree | ba70b1001cdad2a3d13c6f5a2309f0d43ace1458 /Modules/GoogleTest.cmake | |
| parent | 22bfe014d0a2676f46523b3e0cd334dba154f77a (diff) | |
| download | CMake-832858195ec4e9ac1ef513d7c2974d62a4f941c7.zip CMake-832858195ec4e9ac1ef513d7c2974d62a4f941c7.tar.gz CMake-832858195ec4e9ac1ef513d7c2974d62a4f941c7.tar.bz2 | |
GoogleTest: Fix include path in the generated file
The generated ..._include.cmake file contained an inclusion of
GoogleTestAddTests without any path. In general, this is a good
approach since it enables to correctly catch possibly
user-customized files.
However, in this case, it didn’t work this way since the
..._include.cmake file is evaluated by a separate CMake call under
a custom command. Because of this, the CMAKE_MODULE_PATH is not set
as expected by the user and the said inclusion catches CMake own
version of the module rather than the possibly user-customized one.
This change fixes this by making the inclusion with an absolute path
determined upon the ..._include.cmake file generation.
Diffstat (limited to 'Modules/GoogleTest.cmake')
| -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" |