[Cmake-commits] CMake branch, next, updated. v3.0.2-5628-g05d7933

[Nils Gladitz]

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  05d793389215d5f80e7b4e444ecb1452250e6cbb (commit)
       via  71da30cae09d56a81fe43b8c65b9dfeea1d7dd06 (commit)
      from  279b884a14f424c64ec7d72b68cc8e6e613eb854 (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=05d793389215d5f80e7b4e444ecb1452250e6cbb
commit 05d793389215d5f80e7b4e444ecb1452250e6cbb
Merge: 279b884 71da30c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 6 16:29:55 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 6 16:29:55 2014 -0400

    Merge topic 'fix-ninja-rsp-var-duplication' into next
    
    71da30ca Ninja: Fix variable duplication in RSP rules


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71da30cae09d56a81fe43b8c65b9dfeea1d7dd06
commit 71da30cae09d56a81fe43b8c65b9dfeea1d7dd06
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 6 22:29:09 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Oct 6 22:29:09 2014 +0200

    Ninja: Fix variable duplication in RSP rules
    
    Stream clear() resets stream state but does not actually clear its content.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 543ecdb..f391203 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -205,7 +205,7 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
       && args.size() + buildstr.size() + assignments.size()
                                                     > (size_t) cmdLineLimit) {
     buildstr += "_RSP_FILE";
-    variable_assignments.clear();
+    variable_assignments.str(std::string());
     cmGlobalNinjaGenerator::WriteVariable(variable_assignments,
                                           "RSP_FILE", rspfile, "", 1);
     assignments += variable_assignments.str();

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake