echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ExternalProject: Catch empty REMOTE or LOCAL earlier

Browse Source 
If we are given an empty string for URL, or we have a logic error that leads
to the file we download to being an empty string, we will now catch this at
CMake configure time instead of whenever the download is attempted at
build time.
This commit is contained in:
Craig Scott 2024-01-27 11:44:01 +11:00
parent e72791ecf6
commit aab6be9aad
No known key found for this signature in database
GPG Key ID: 6FF37CBDCCADED9F
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/ExternalProject.cmake
View File

@ -1518,6 +1518,13 @@ function(_ep_write_downloadfile_script
netrc
netrc_file
)
if("x${REMOTE}" STREQUAL "x")
message(FATAL_ERROR "REMOTE can't be empty")
endif()
if("x${LOCAL}" STREQUAL "x")
message(FATAL_ERROR "LOCAL can't be empty")
endif()
if(timeout)
set(TIMEOUT_ARGS TIMEOUT ${timeout})
set(TIMEOUT_MSG "${timeout} seconds")

8
Modules/ExternalProject/download.cmake.in
View File

@ -71,14 +71,6 @@ function(sleep_before_download attempt)
execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}")
endfunction()
if("@LOCAL@" STREQUAL "")
message(FATAL_ERROR "LOCAL can't be empty")
endif()
if("@REMOTE@" STREQUAL "")
message(FATAL_ERROR "REMOTE can't be empty")
endif()
if(EXISTS "@LOCAL@")
check_file_hash(has_hash hash_is_good)
if(has_hash)