[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-741-g6da9645

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6da96457e0a3c423283b9d0e342599a3f1bb7fc0 (commit)
       via  af7da934a70d2d694cb378db9283eff1859b2747 (commit)
      from  3708bfd2346681e36e0bc57bbf1d169912e02af6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6da96457e0a3c423283b9d0e342599a3f1bb7fc0
commit 6da96457e0a3c423283b9d0e342599a3f1bb7fc0
Merge: 3708bfd af7da93
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 7 09:38:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 7 09:38:29 2016 -0400

    Merge topic 'ExternalProject-default-download-filename' into next
    
    af7da934 ExternalProject: Use default file name if extracting from URL fails


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af7da934a70d2d694cb378db9283eff1859b2747
commit af7da934a70d2d694cb378db9283eff1859b2747
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Tue Jul 5 16:17:12 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 7 09:35:42 2016 -0400

    ExternalProject: Use default file name if extracting from URL fails
    
    The download/extract step uses the file name only internally so we can
    just use a fallback default name if one cannot be extracted from the
    URL.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index ee517f6..3686fb6 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1878,7 +1878,12 @@ function(_ep_add_download_command name)
         elseif(no_extract)
           get_filename_component(fname "${fname}" NAME)
         else()
-          message(FATAL_ERROR "Could not extract tarball filename from url:\n  ${url}")
+          # Fall back to a default file name.  The actual file name does not
+          # matter because it is used only internally and our extraction tool
+          # inspects the file content directly.  If it turns out the wrong URL
+          # was given that will be revealed during the build which is an easier
+          # place for users to diagnose than an error here anyway.
+          set(fname "archive.tar")
         endif()
         string(REPLACE ";" "-" fname "${fname}")
         set(file ${download_dir}/${fname})

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake