[Cmake-commits] CMake branch, next, updated. v3.5.1-693-g46f442f

[Ben Boeckel]

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  46f442feed475ecaa2c43499f5bc0bbf00a60289 (commit)
       via  4fb6148000219c6a08c1d60ac6cb30febc2b80b2 (commit)
      from  aaf515c3532a68f33df3fc274b199c35d52205d1 (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=46f442feed475ecaa2c43499f5bc0bbf00a60289
commit 46f442feed475ecaa2c43499f5bc0bbf00a60289
Merge: aaf515c 4fb6148
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 29 11:50:15 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 29 11:50:15 2016 -0400

    Merge topic 'external-project-no-extract' into next
    
    4fb61480 fixup! ExternalProject: add support for just downloading a file


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fb6148000219c6a08c1d60ac6cb30febc2b80b2
commit 4fb6148000219c6a08c1d60ac6cb30febc2b80b2
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 29 11:49:54 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 29 11:49:54 2016 -0400

    fixup! ExternalProject: add support for just downloading a file

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index f2f005b..0c4d9d8 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -77,7 +77,7 @@ Create custom targets to build projects in external trees
     Path to a certificate authority file
   ``TIMEOUT <seconds>``
     Time allowed for file download operations
-  ``NO_EXTRACT 1``
+  ``DOWNLOAD_NO_EXTRACT 1``
     Just download the file and do not extract it; the full path to the
     downloaded file is available as ``<DOWNLOADED_FILE>``.
 
@@ -1878,7 +1878,7 @@ function(_ep_add_download_command name)
       set(cmd   ${CMAKE_COMMAND} -E remove_directory ${source_dir}
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir})
     else()
-      get_property(no_extract TARGET "${name}" PROPERTY _EP_NO_EXTRACT SET)
+      get_property(no_extract TARGET "${name}" PROPERTY _EP_DOWNLOAD_NO_EXTRACT SET)
       if("${url}" MATCHES "^[a-z]+://")
         # TODO: Should download and extraction be different steps?
         if("x${fname}" STREQUAL "x")

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

Summary of changes:
 Modules/ExternalProject.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake