[Cmake-commits] CMake branch, next, updated. v3.7.0-1135-g3c0ece3

[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  3c0ece3d42f9251457ff3358aa2626d99fb32532 (commit)
       via  5f795781b8b2594c17fe6fe4385d0b2b8db97278 (commit)
      from  9b8450a4a95777151048b769a2fd8cd79fd0bd92 (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=3c0ece3d42f9251457ff3358aa2626d99fb32532
commit 3c0ece3d42f9251457ff3358aa2626d99fb32532
Merge: 9b8450a 5f79578
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 11:27:30 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 14 11:27:30 2016 -0500

    Merge topic 'ExternalProject-URL-and-UPDATE_DISCONNECTED' into next
    
    5f795781 ExternalProject: Fix UPDATE_DISCONNECTED with URL downloads


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f795781b8b2594c17fe6fe4385d0b2b8db97278
commit 5f795781b8b2594c17fe6fe4385d0b2b8db97278
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 10:44:04 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 14 10:55:34 2016 -0500

    ExternalProject: Fix UPDATE_DISCONNECTED with URL downloads
    
    When `UPDATE_DISCONNECTED` is enabled the post-update steps
    unconditionally depend on a `skip-update` step instead of `update`.
    Make `skip-update` available whenever `UPDATE_DISCONNECTED` is enabled,
    whether there is a real update step or not.
    
    Closes: #16428

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 1ba4a8f..b15b3f7 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -2165,12 +2165,12 @@ Update to Mercurial >= 2.1.1.
     ${uses_terminal}
     )
 
-  if(always AND update_disconnected)
+  if(update_disconnected)
     _ep_get_step_stampfile(${name} skip-update skip-update_stamp_file)
     string(REPLACE "Performing" "Skipping" comment "${comment}")
     ExternalProject_Add_Step(${name} skip-update
       COMMENT ${comment}
-      ALWAYS 1
+      ALWAYS ${always}
       EXCLUDE_FROM_MAIN 1
       WORKING_DIRECTORY ${work_dir}
       DEPENDEES download
diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt b/Tests/ExternalProjectLocal/CMakeLists.txt
index 17f1630..5b94163 100644
--- a/Tests/ExternalProjectLocal/CMakeLists.txt
+++ b/Tests/ExternalProjectLocal/CMakeLists.txt
@@ -131,6 +131,7 @@ ExternalProject_Add(${proj}
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
   INSTALL_COMMAND ""
   LOG_BUILD 1
+  UPDATE_DISCONNECTED 1
 )
 set_property(TARGET ${proj} PROPERTY FOLDER "Local/TGZ")
 

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

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


hooks/post-receive
-- 
CMake