diff options
| author | Johnny Jazeix <jazeix@gmail.com> | 2019-12-23 09:35:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-15 15:03:35 (GMT) |
| commit | c0da651c09e11f9868529b7f8c4dc8f97c4546c8 (patch) | |
| tree | 2c83d48dba0e6bdde0b710b5f89dca4199c4eb7b | |
| parent | b56d429324330a9eb8d3c1860333969140851dd7 (diff) | |
| download | CMake-c0da651c09e11f9868529b7f8c4dc8f97c4546c8.zip CMake-c0da651c09e11f9868529b7f8c4dc8f97c4546c8.tar.gz CMake-c0da651c09e11f9868529b7f8c4dc8f97c4546c8.tar.bz2 | |
file(DOWNLOAD): Don't fail if given just a filename to write to
Fixes: #17969
| -rw-r--r-- | Source/cmFileCommand.cxx | 3 | ||||
| -rw-r--r-- | Tests/CMakeTests/FileDownloadTest.cmake.in | 18 | ||||
| -rw-r--r-- | Tests/CMakeTests/FileTestScript.cmake | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 1fdfa87..d1775a7 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1707,7 +1707,8 @@ bool HandleDownloadCommand(std::vector<std::string> const& args, // as we receive downloaded bits from curl... // std::string dir = cmSystemTools::GetFilenamePath(file); - if (!cmSystemTools::FileExists(dir) && !cmSystemTools::MakeDirectory(dir)) { + if (!dir.empty() && !cmSystemTools::FileExists(dir) && + !cmSystemTools::MakeDirectory(dir)) { std::string errstring = "DOWNLOAD error: cannot create directory '" + dir + "' - Specify file by full path name and verify that you " "have directory creation and file write privileges."; diff --git a/Tests/CMakeTests/FileDownloadTest.cmake.in b/Tests/CMakeTests/FileDownloadTest.cmake.in index 6c1ee75..5bd3803 100644 --- a/Tests/CMakeTests/FileDownloadTest.cmake.in +++ b/Tests/CMakeTests/FileDownloadTest.cmake.in @@ -145,3 +145,21 @@ file(DOWNLOAD ) message(STATUS "${status}") __reportIfWrongStatus("${status}" 6) # 6 corresponds to an unresolvable host name + +message(STATUS "FileDownload:12") +set(absFile "@CMAKE_CURRENT_BINARY_DIR@/file12.png") +if(EXISTS "${absFile}") + file(RENAME ${absFile} "${absFile}_beingRemoved") + file(REMOVE "${absFile}_beingRemoved") +endif() +file(DOWNLOAD + ${url} + file12.png + TIMEOUT ${timeout} + EXPECTED_MD5 dbd330d52f4dbd60115d4191904ded92 + STATUS status + ) +__reportIfWrongStatus("${status}" 0) +if(NOT EXISTS file12.png) + message(SEND_ERROR "file12.png not downloaded: ${status}") +endif() diff --git a/Tests/CMakeTests/FileTestScript.cmake b/Tests/CMakeTests/FileTestScript.cmake index 9a43569..145f28a 100644 --- a/Tests/CMakeTests/FileTestScript.cmake +++ b/Tests/CMakeTests/FileTestScript.cmake @@ -183,7 +183,7 @@ elseif(testname STREQUAL to_native_path) # pass elseif(testname STREQUAL download_wrong_number_of_args) # fail file(DOWNLOAD zzzz://bogus/ffff) -elseif(testname STREQUAL download_file_with_no_path) # fail +elseif(testname STREQUAL download_file_with_no_path) # pass file(DOWNLOAD zzzz://bogus/ffff ffff) elseif(testname STREQUAL download_missing_time) # fail |