mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FetchContent_missing_SOURCE_DIR'

Browse Source 
b030a6af88 FetchContent: Raise error if manually given source dir does not exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5317
This commit is contained in:
Craig Scott
2020-10-04 21:02:02 +00:00
committed by Kitware Robot
parent 3ae3b352d1 b030a6af88
commit a771e2146a
6 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FetchContent.cmake
View File

@@ -1052,6 +1052,12 @@ function(FetchContent_Populate contentName)
# The source directory has been explicitly provided in the cache,
# so no population is required. The build directory may still be specified
# by the declared details though.
if(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()
set(${contentNameLower}_SOURCE_DIR "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
cmake_parse_arguments(savedDetails "" "BINARY_DIR" "" ${contentDetails})

8
Tests/RunCMake/FetchContent/ManualSourceDirectory.cmake Normal file
View File

@@ -0,0 +1,8 @@
include(FetchContent)
FetchContent_Declare(
WithProject
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/ADirThatDoesNotExist
)
FetchContent_MakeAvailable(WithProject)

1
Tests/RunCMake/FetchContent/ManualSourceDirectoryMissing-result.txt Normal file
View File

@@ -0,0 +1 @@
1

2
Tests/RunCMake/FetchContent/ManualSourceDirectoryMissing-stderr.txt Normal file
View File

@@ -0,0 +1,2 @@
*Manually specified source directory is missing:
+ *FETCHCONTENT_SOURCE_DIR_WITHPROJECT --> .*/ADirThatDoesNotExist

8
Tests/RunCMake/FetchContent/ManualSourceDirectoryMissing.cmake Normal file
View File

@@ -0,0 +1,8 @@
include(FetchContent)
FetchContent_Declare(
WithProject
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/WithProject
)
FetchContent_MakeAvailable(WithProject)

7
Tests/RunCMake/FetchContent/RunCMakeTest.cmake
View File

@@ -15,6 +15,13 @@ run_cmake(MakeAvailable)
run_cmake(MakeAvailableTwice)
run_cmake(MakeAvailableUndeclared)
run_cmake_with_options(ManualSourceDirectory
-D "FETCHCONTENT_SOURCE_DIR_WITHPROJECT=${CMAKE_CURRENT_LIST_DIR}/WithProject"
)
run_cmake_with_options(ManualSourceDirectoryMissing
-D "FETCHCONTENT_SOURCE_DIR_WITHPROJECT=${CMAKE_CURRENT_LIST_DIR}/ADirThatDoesNotExist"
)
function(run_FetchContent_DirOverrides)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/DirOverrides-build)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")