diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-12-21 23:43:17 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2020-12-22 00:09:18 (GMT) |
| commit | 51595e5f014be2a948e2e3c3ab5a5ce165deabdf (patch) | |
| tree | 30739f88395889bbe7cfd858d336bef1f8465402 /Modules/FetchContent.cmake | |
| parent | 81809d1485a0b05c85f7f5b57adfc20c169c5a44 (diff) | |
| download | CMake-51595e5f014be2a948e2e3c3ab5a5ce165deabdf.zip CMake-51595e5f014be2a948e2e3c3ab5a5ce165deabdf.tar.gz CMake-51595e5f014be2a948e2e3c3ab5a5ce165deabdf.tar.bz2 | |
FetchContent: Relative SOURCE_DIR override cannot be a hard error
Fixes: #21624
Diffstat (limited to 'Modules/FetchContent.cmake')
| -rw-r--r-- | Modules/FetchContent.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake index 40cc362..c81b371 100644 --- a/Modules/FetchContent.cmake +++ b/Modules/FetchContent.cmake @@ -1053,7 +1053,14 @@ function(FetchContent_Populate contentName) # so no population is required. The build directory may still be specified # by the declared details though. - if(NOT EXISTS "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}") + if(NOT IS_ABSOLUTE "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}") + # Don't check this directory because we don't know what location it is + # expected to be relative to. We can't make this a hard error for backward + # compatibility reasons. + message(WARNING "Relative source directory specified. This is not safe, " + "as it depends on the calling directory scope.\n" + " FETCHCONTENT_SOURCE_DIR_${contentNameUpper} --> ${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}") + elseif(NOT EXISTS "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}") message(FATAL_ERROR "Manually specified source directory is missing:\n" " FETCHCONTENT_SOURCE_DIR_${contentNameUpper} --> ${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}") endif() |