[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-609-ga745016

[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  a7450168373f48228c3eb837178867f82fcbee2c (commit)
       via  99d6de6c1a5871ba03fa008c984cd5408940c3cd (commit)
      from  253db6906ca42d7e02dadbb94c9a2305708a7dbe (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=a7450168373f48228c3eb837178867f82fcbee2c
commit a7450168373f48228c3eb837178867f82fcbee2c
Merge: 253db69 99d6de6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 13:25:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 13:25:11 2017 -0500

    Merge topic 'ExternalProject-fix-download-log' into next
    
    99d6de6c ExternalProject: only append `COMMAND` if actually adding a command


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99d6de6c1a5871ba03fa008c984cd5408940c3cd
commit 99d6de6c1a5871ba03fa008c984cd5408940c3cd
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 27 11:30:13 2017 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Feb 27 11:33:31 2017 -0500

    ExternalProject: only append `COMMAND` if actually adding a command
    
    Fixes #16544.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 00781d6..97438e6 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1987,11 +1987,10 @@ function(_ep_add_download_command name)
         set(comment "Performing download step (${steps}) for '${name}'")
         _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}")
       endif()
-      list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake
-        COMMAND)
+      list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake)
       if (NOT no_extract)
         _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}")
-        list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
+        list(APPEND cmd COMMAND ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
       else ()
         set_property(TARGET ${name} PROPERTY _EP_DOWNLOADED_FILE ${file})
       endif ()
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 72c20eb..6b73563 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -90,6 +90,16 @@ ExternalProject_Add(${proj}
 )
 set_property(TARGET ${proj} PROPERTY FOLDER "")
 
+set(proj NoExtractLogDownload)
+ExternalProject_Add(${proj}
+  URL ${CMAKE_CURRENT_SOURCE_DIR}/gitrepo.tgz
+  DOWNLOAD_NO_EXTRACT 1
+  LOG_DOWNLOAD 1
+  BUILD_COMMAND ""
+  CONFIGURE_COMMAND ""
+  INSTALL_COMMAND ""
+)
+
 
 # CVS-based tests:
 #

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

Summary of changes:
 Modules/ExternalProject.cmake        |    5 ++---
 Tests/ExternalProject/CMakeLists.txt |   10 ++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake