[Cmake-commits] CMake branch, next, updated. v3.3.1-3013-g87cc1f2

[Daniele E. Domenichelli]

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  87cc1f23f451f2f0c9ca6186d1c06f00438abaac (commit)
       via  7c5b6ed5c851266b4f6dae5ef864509627acdaf8 (commit)
       via  b04c38159eb4db35770f541f7671fe33a3f32bc2 (commit)
       via  6fd548f2205c73215812fda416fbe6f0dd166bb9 (commit)
      from  6968cb0bd08a46072a39ea3d0b760f7add0e71fa (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87cc1f23f451f2f0c9ca6186d1c06f00438abaac
commit 87cc1f23f451f2f0c9ca6186d1c06f00438abaac
Merge: 6968cb0 7c5b6ed
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Thu Sep 17 08:39:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 17 08:39:30 2015 -0400

    Merge topic 'ExternalProject_stash_save_all' into next
    
    7c5b6ed5 ExternalProject: Use "git stash save --all" only if supported (#15722)
    b04c3815 ExternalProject: Use GIT_VERSION_STRING instead of custom method
    6fd548f2 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c5b6ed5c851266b4f6dae5ef864509627acdaf8
commit 7c5b6ed5c851266b4f6dae5ef864509627acdaf8
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Sep 17 11:41:07 2015 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Sep 17 12:05:07 2015 +0200

    ExternalProject: Use "git stash save --all" only if supported (#15722)
    
    The --all option for git-stash wasn't introduced until git version 1.7.6.

diff --git a/Help/release/dev/ExternalProject_stash_save_all.rst b/Help/release/dev/ExternalProject_stash_save_all.rst
new file mode 100644
index 0000000..e00ed44
--- /dev/null
+++ b/Help/release/dev/ExternalProject_stash_save_all.rst
@@ -0,0 +1,5 @@
+ExternalProject_stash_save_all
+------------------------------
+
+* Use "git stash save --all" only if supported. The --all option for git-stash
+  wasn't introduced until git version 1.7.6.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index db61d23..90ceedf 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -646,6 +646,11 @@ endfunction()
 
 
 function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_submodules git_repository work_dir)
+  if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.6)
+    set(git_stash_save_options --all --quiet)
+  else()
+    set(git_stash_save_options --quiet)
+  endif()
   file(WRITE ${script_filename}
 "if(\"${git_tag}\" STREQUAL \"\")
   message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -724,7 +729,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\" STREQUAL \"\${head_sha}\"
     # perform git pull --rebase
     if(need_stash)
       execute_process(
-        COMMAND \"${git_EXECUTABLE}\" stash save --all --quiet
+        COMMAND \"${git_EXECUTABLE}\" stash save ${git_stash_save_options}
         WORKING_DIRECTORY \"${work_dir}\"
         RESULT_VARIABLE error_code
         )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b04c38159eb4db35770f541f7671fe33a3f32bc2
commit b04c38159eb4db35770f541f7671fe33a3f32bc2
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Sep 17 11:19:36 2015 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Sep 17 11:47:26 2015 +0200

    ExternalProject: Use GIT_VERSION_STRING instead of custom method
    
    GIT_VERSION_STRING is available in FindGit.cmake since CMake version 2.8.8

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0fbf7c3..db61d23 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1631,20 +1631,6 @@ function(_ep_add_mkdir_command name)
 endfunction()
 
 
-function(_ep_get_git_version git_EXECUTABLE git_version_var)
-  if(git_EXECUTABLE)
-    execute_process(
-      COMMAND "${git_EXECUTABLE}" --version
-      OUTPUT_VARIABLE ov
-      ERROR_VARIABLE ev
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-    string(REGEX REPLACE "^git version (.+)$" "\\1" version "${ov}")
-    set(${git_version_var} "${version}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-
 function(_ep_is_dir_empty dir empty_var)
   file(GLOB gr "${dir}/*")
   if("${gr}" STREQUAL "")
@@ -1747,8 +1733,7 @@ function(_ep_add_download_command name)
 
     # The git submodule update '--recursive' flag requires git >= v1.6.5
     #
-    _ep_get_git_version("${GIT_EXECUTABLE}" git_version)
-    if(git_version VERSION_LESS 1.6.5)
+    if(GIT_VERSION_STRING VERSION_LESS 1.6.5)
       message(FATAL_ERROR "error: git version 1.6.5 or later required for 'git submodule update --recursive': git_version='${git_version}'")
     endif()
 

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

Summary of changes:
 .../release/dev/ExternalProject_stash_save_all.rst |    5 ++++
 Modules/ExternalProject.cmake                      |   24 ++++++--------------
 Source/CMakeVersion.cmake                          |    2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 Help/release/dev/ExternalProject_stash_save_all.rst


hooks/post-receive
-- 
CMake