[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2643-g289c3d1

Bill Hoffman bill.hoffman at kitware.com
Mon Mar 25 15:20:12 EDT 2013


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  289c3d10c21cd56c223017bd6c8b3cb6f4fccd1a (commit)
       via  909b9f7926e839c5c8e081fea7eec0d8edcf7f12 (commit)
      from  17fe46a437bb8ce2400cdf1e8a7f89c7b0373b71 (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=289c3d10c21cd56c223017bd6c8b3cb6f4fccd1a
commit 289c3d10c21cd56c223017bd6c8b3cb6f4fccd1a
Merge: 17fe46a 909b9f7
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Mar 25 15:20:10 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 25 15:20:10 2013 -0400

    Merge topic 'ep_retry_clone' into next
    
    909b9f7 Incremenat the number of trys for git clones.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=909b9f7926e839c5c8e081fea7eec0d8edcf7f12
commit 909b9f7926e839c5c8e081fea7eec0d8edcf7f12
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Mar 25 15:18:37 2013 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Mon Mar 25 15:18:37 2013 -0400

    Incremenat the number of trys for git clones.
    
    This fixes a bug where the number of try variable was not
    incremented each time a git clone was attempted.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 95ec171..40e14d5 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -296,6 +296,7 @@ while(error_code AND number_of_tries LESS 3)
     WORKING_DIRECTORY \"${work_dir}\"
     RESULT_VARIABLE error_code
     )
+  math(EXPR number_of_tries \"\${number_of_tries} + 1\")
 endwhile()
 if(number_of_tries GREATER 1)
   message(STATUS \"Had to git clone more than once:

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

Summary of changes:
 Modules/ExternalProject.cmake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list