[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3409-g80c00e3

Brad King brad.king at kitware.com
Fri Jul 26 08:55:00 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  80c00e303c7a917cfe20c090fa474c1984b68f4b (commit)
       via  fd646c41869d647b86eff18eca256ac4d0882650 (commit)
      from  d7bc12c7f44ca5c63dcd110c25873502da7b1ee3 (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=80c00e303c7a917cfe20c090fa474c1984b68f4b
commit 80c00e303c7a917cfe20c090fa474c1984b68f4b
Merge: d7bc12c fd646c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 26 08:54:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 26 08:54:59 2013 -0400

    Merge topic 'ninja_bad_cmcldeps_paths' into next
    
    fd646c4 Ninja: Fix cmcldeps compilation on VS 6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd646c41869d647b86eff18eca256ac4d0882650
commit fd646c41869d647b86eff18eca256ac4d0882650
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 26 08:54:07 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 26 08:54:07 2013 -0400

    Ninja: Fix cmcldeps compilation on VS 6

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index a0ef6e6..8571557 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -145,7 +145,7 @@ static void outputDepFile(const std::string& dfile, const std::string& objfile,
     return;
   std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
   replaceAll(cwd, "/", "\\");
-  cwd.push_back('\\');
+  cwd += "\\";
 
   std::string tmp = objfile;
   escapePath(tmp);

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

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