[Cmake-commits] CMake branch, next, updated. v2.8.8-3193-g23fa3a7

Peter Kuemmel syntheticpp at gmx.net
Fri Jun 15 11:52:58 EDT 2012


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  23fa3a7ac3e71d3a1184f84bad39ff853e5a771c (commit)
       via  2de963d9966f7ffbdbd75f6d55661ab635cfb3d7 (commit)
      from  5844cc17e5a4f66cbfb9ae998ea5b7984df54a73 (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=23fa3a7ac3e71d3a1184f84bad39ff853e5a771c
commit 23fa3a7ac3e71d3a1184f84bad39ff853e5a771c
Merge: 5844cc1 2de963d
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 11:52:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 15 11:52:57 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    2de963d Ninja: don't remove space between command and parameters


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2de963d9966f7ffbdbd75f6d55661ab635cfb3d7
commit 2de963d9966f7ffbdbd75f6d55661ab635cfb3d7
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jun 15 17:52:17 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Fri Jun 15 17:52:17 2012 +0200

    Ninja: don't remove space between command and parameters

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 1eadf61..85fed5d 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -707,7 +707,7 @@ int main() {
                   prefix, cl + nol + show + clrest, true);
 
     // compile rc file with rc.exe
-    return process(srcfilename, "" , objfile, prefix, binpath + rest);
+    return process(srcfilename, "" , objfile, prefix, binpath + " " + rest);
   }
 
   usage("Invalid language specified.");

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

Summary of changes:
 Source/cmcldeps.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list