diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-12-22 20:49:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-22 20:49:37 (GMT) |
| commit | ce9a9e00a8d7a5117719ce2238bcf995e69c820d (patch) | |
| tree | d8377468ed6ab3e4a8cd5b876482263a4bd869d4 /Modules | |
| parent | 3e05e26296fc506b9deef357708a48dac8598d33 (diff) | |
| parent | 51595e5f014be2a948e2e3c3ab5a5ce165deabdf (diff) | |
| download | CMake-ce9a9e00a8d7a5117719ce2238bcf995e69c820d.zip CMake-ce9a9e00a8d7a5117719ce2238bcf995e69c820d.tar.gz CMake-ce9a9e00a8d7a5117719ce2238bcf995e69c820d.tar.bz2 | |
Merge topic 'fc-relative-SOURCE_DIR' into release-3.19
51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5641
Diffstat (limited to 'Modules')
| -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() |