[Cmake-commits] CMake branch, next, updated. v3.7.0-1143-g496e09e

[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  496e09ee2452ce9eca8f185181e013301dd4b5d4 (commit)
       via  4deaa25f46bbe021648d837a936be64117922157 (commit)
      from  647c3cd2a114dd3c28cddc6b8e2b0ebd7b0b7431 (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=496e09ee2452ce9eca8f185181e013301dd4b5d4
commit 496e09ee2452ce9eca8f185181e013301dd4b5d4
Merge: 647c3cd 4deaa25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 15 09:13:15 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 15 09:13:15 2016 -0500

    Merge topic 'ExternalProject-fix-UPDATE_DISCONNECTED' into next
    
    4deaa25f ExternalProject: Fix UPDATE_DISCONNECTED with empty update steps


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4deaa25f46bbe021648d837a936be64117922157
commit 4deaa25f46bbe021648d837a936be64117922157
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: Tue Nov 15 08:45:04 2016 -0500

    ExternalProject: Fix UPDATE_DISCONNECTED with empty update steps
    
    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:


hooks/post-receive
-- 
CMake