[Cmake-commits] CMake branch, next, updated. v2.8.6-1707-g1343760

David Cole david.cole at kitware.com
Wed Oct 26 07:48:43 EDT 2011


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  1343760f09cbb205d646b0119305fed0b866ed18 (commit)
       via  499c10457282f44d954c8a7385cbf9f8c82d1b08 (commit)
       via  2b0f8c7de0c922c98753a3a13d251306aabc9bdb (commit)
      from  f63f71ca82216825eeea9127e683f5e211a93b18 (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=1343760f09cbb205d646b0119305fed0b866ed18
commit 1343760f09cbb205d646b0119305fed0b866ed18
Merge: f63f71c 499c104
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Oct 26 07:48:36 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 26 07:48:36 2011 -0400

    Merge topic 'fix-12383-clear-ctest-vecs' into next
    
    499c104 CTest: Clear custom vectors before populating (#12383)
    2b0f8c7 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=499c10457282f44d954c8a7385cbf9f8c82d1b08
commit 499c10457282f44d954c8a7385cbf9f8c82d1b08
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Oct 26 00:19:46 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Oct 26 00:19:46 2011 -0400

    CTest: Clear custom vectors before populating (#12383)
    
    Important when calling ctest commands in a loop from a script.
    Each time Populate gets called, it uses the current definition
    of the variable. Without the clear, it was accumulating additional
    identical values each time through the loop.

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 702ba10..2a2cac9 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2526,6 +2526,8 @@ void cmCTest::PopulateCustomVector(cmMakefile* mf, const char* def,
   cmSystemTools::ExpandListArgument(dval, slist);
   std::vector<std::string>::iterator it;
 
+  vec.clear();
+
   for ( it = slist.begin(); it != slist.end(); ++it )
     {
     cmCTestLog(this, DEBUG, "  -- " << it->c_str() << std::endl);

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

Summary of changes:
 Source/cmCTest.cxx                |    2 ++
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list