[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1502-g4c0b1e3

[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  4c0b1e3de0974769e7a90ae2bb8f66e9802af8d1 (commit)
       via  40bf640cec545d4cbc4728b6fae78525ebd66368 (commit)
       via  7cec58399d935a1aa30d6120640e90b951fcc686 (commit)
      from  2d1fa0bccae394270e3cc70edb2c747728f166b0 (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=4c0b1e3de0974769e7a90ae2bb8f66e9802af8d1
commit 4c0b1e3de0974769e7a90ae2bb8f66e9802af8d1
Merge: 2d1fa0b 40bf640
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Thu Mar 27 15:39:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 27 15:39:53 2014 -0400

    Merge topic 'ExternalProject_GitUpdate' into next
    
    40bf640c ExternalProject: Strip out "origin/" from git tag
    7cec5839 ExternalProject: Use "git stash save" instead of "git stash"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40bf640cec545d4cbc4728b6fae78525ebd66368
commit 40bf640cec545d4cbc4728b6fae78525ebd66368
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Mar 27 20:35:23 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Mar 27 20:38:35 2014 +0100

    ExternalProject: Strip out "origin/" from git tag

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7d4aa16..83ddafd 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -293,6 +293,9 @@ define_property(DIRECTORY PROPERTY "EP_STEP_TARGETS" INHERITED
 
 
 function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_submodules src_name work_dir gitclone_infofile gitclone_stampfile)
+  if("${git_tag}" MATCHES "^origin/(.+)$")
+    set(git_tag ${CMAKE_MATCH_1})
+  endif()
   file(WRITE ${script_filename}
 "if(\"${git_tag}\" STREQUAL \"\")
   message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -444,6 +447,9 @@ endfunction()
 
 
 function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_submodules git_repository work_dir)
+  if("${git_tag}" MATCHES "^origin/(.+)$")
+    set(git_tag ${CMAKE_MATCH_1})
+  endif()
   file(WRITE ${script_filename}
 "if(\"${git_tag}\" STREQUAL \"\")
   message(FATAL_ERROR \"Tag for git checkout should not be empty.\")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cec58399d935a1aa30d6120640e90b951fcc686
commit 7cec58399d935a1aa30d6120640e90b951fcc686
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Mar 27 19:53:42 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Mar 27 19:53:42 2014 +0100

    ExternalProject: Use "git stash save" instead of "git stash"

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index bbf2193..7d4aa16 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -511,7 +511,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 --all --quiet
+        COMMAND \"${git_EXECUTABLE}\" stash save --all --quiet
         WORKING_DIRECTORY \"${work_dir}\"
         RESULT_VARIABLE error_code
         )

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

Summary of changes:
 Modules/ExternalProject.cmake |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake