[Cmake-commits] CMake branch, next, updated. v3.2.2-3142-g8cb9767

[Brad King]

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  8cb976712c17ba06cf292e9cdf749e2eea3d2d13 (commit)
       via  9da84ab64a94c641e5316f8a72df2f36d7a0e321 (commit)
      from  58156dafefefc35bded48901ba58a41df8d061ab (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=8cb976712c17ba06cf292e9cdf749e2eea3d2d13
commit 8cb976712c17ba06cf292e9cdf749e2eea3d2d13
Merge: 58156da 9da84ab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 09:16:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 09:16:59 2015 -0400

    Merge topic 'ninja-per-target-rules' into next
    
    9da84ab6 Ninja: Fix regression in .rsp file support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9da84ab64a94c641e5316f8a72df2f36d7a0e321
commit 9da84ab64a94c641e5316f8a72df2f36d7a0e321
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 09:14:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 09:15:10 2015 -0400

    Ninja: Fix regression in .rsp file support
    
    In commit a390de65 (Ninja: Generate separate compile and link rules for
    each target, 2015-05-18) we removed the _RSP_FILE suffix from rule names
    meant for targets that need to build with a .rsp file because we now use
    per-target rules anyway.  Remove this suffix from references to the rule
    too.
    
    Reported-by: Herz Thomas <Thomas.Herz at kuka.com>

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

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

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


hooks/post-receive
-- 
CMake