[Cmake-commits] CMake branch, master, updated. v3.9.0-rc6-257-g75cbc56

Kitware Robot kwrobot at kitware.com
Wed Jul 12 13:45:04 EDT 2017


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, master has been updated
       via  75cbc5611d1d3b1726d5d0712f2ef564ea75d9dd (commit)
       via  23fb573c5f8d49bcf748cc8d30bce94dfeb5b2e6 (commit)
       via  627422d9de2de41c90d4168b5ff97a074e7232ae (commit)
      from  ca7f6c3451c649c80a7f6f81f2c70fa9a718f990 (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=75cbc5611d1d3b1726d5d0712f2ef564ea75d9dd
commit 75cbc5611d1d3b1726d5d0712f2ef564ea75d9dd
Merge: ca7f6c3 23fb573
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 12 13:38:02 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 12 13:38:02 2017 -0400

    Merge branch 'release-3.8'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23fb573c5f8d49bcf748cc8d30bce94dfeb5b2e6
commit 23fb573c5f8d49bcf748cc8d30bce94dfeb5b2e6
Merge: 0d5a225 627422d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 12 13:37:54 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 12 13:37:54 2017 -0400

    Merge branch 'backport-ep-log-no-extract-fix' into release-3.8


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=627422d9de2de41c90d4168b5ff97a074e7232ae
commit 627422d9de2de41c90d4168b5ff97a074e7232ae
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: Wed Jul 12 11:33:07 2017 -0400

    ExternalProject: only append `COMMAND` if actually adding a command
    
    Fixes #17046.
    
    (cherry picked from commit 99d6de6c1a5871ba03fa008c984cd5408940c3cd)

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index b42d2dd..34dc98c 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1990,11 +1990,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:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list