diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-09 13:53:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-09 13:53:40 (GMT) |
| commit | a2f9e674bb15d91af15cec815a5c40c0ecc2ee9f (patch) | |
| tree | ab7cc36f3a1a616684e3671afc5a101eed6abd9d /Modules | |
| parent | 669595723707d9104ef233b11ecd868d240636d8 (diff) | |
| parent | 629d106c5e3caee76873540ef50885acb82610ee (diff) | |
| download | CMake-a2f9e674bb15d91af15cec815a5c40c0ecc2ee9f.zip CMake-a2f9e674bb15d91af15cec815a5c40c0ecc2ee9f.tar.gz CMake-a2f9e674bb15d91af15cec815a5c40c0ecc2ee9f.tar.bz2 | |
Merge topic 'fetchcontent-extra' into release-3.24
629d106c5e Help: Fix typo in FetchContent example, extras should read extra
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: hinell <al.neodim@gmail.com>
Merge-request: !7657
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FetchContent.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake index e490a98..20f0bd2 100644 --- a/Modules/FetchContent.cmake +++ b/Modules/FetchContent.cmake @@ -822,7 +822,7 @@ details: CMake provides a FindGTest module which defines some variables that older projects may use instead of linking to the imported targets. To support -those cases, we can provide an extras file. In keeping with the +those cases, we can provide an extra file. In keeping with the "first to define, wins" philosophy of ``FetchContent``, we only write out that file if something else hasn't already done so. @@ -830,9 +830,9 @@ that file if something else hasn't already done so. FetchContent_MakeAvailable(googletest) - if(NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletest-extras.cmake AND - NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletestExtras.cmake) - file(WRITE ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletest-extras.cmake + if(NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletest-extra.cmake AND + NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletestExtra.cmake) + file(WRITE ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletest-extra.cmake [=[ if("${GTEST_LIBRARIES}" STREQUAL "" AND TARGET GTest::gtest) set(GTEST_LIBRARIES GTest::gtest) |