[Cmake-commits] CMake branch, next, updated. v2.8.8-3374-g89e4d4a

Peter Kuemmel syntheticpp at gmx.net
Fri Jul 6 04:17:42 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  89e4d4a443e0ab84a4e7b427d50a0c1673a273f5 (commit)
       via  37f73c4d2334786208ef5c661e65020e2d42cb9d (commit)
      from  07799a5eeba70a130b6b98c27fee06dd70cf21e4 (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=89e4d4a443e0ab84a4e7b427d50a0c1673a273f5
commit 89e4d4a443e0ab84a4e7b427d50a0c1673a273f5
Merge: 07799a5 37f73c4
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 6 04:17:41 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 6 04:17:41 2012 -0400

    Merge topic 'ninja-fixes' into next
    
    37f73c4 Ninja: don't shadow 'outputs' variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37f73c4d2334786208ef5c661e65020e2d42cb9d
commit 37f73c4d2334786208ef5c661e65020e2d42cb9d
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 6 10:16:45 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Fri Jul 6 10:16:45 2012 +0200

    Ninja: don't shadow 'outputs' variable

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4787cb3..0cf90aa 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -508,20 +508,20 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                          emptyDeps,
                                          symlinkVars);
     } else {
-      cmNinjaDeps outputs;
+      cmNinjaDeps symlinks;
       const std::string soName = this->GetTargetFilePath(this->TargetNameSO);
       // If one link has to be created.
       if (targetOutputReal == soName || targetOutput == soName) {
         symlinkVars["SONAME"] = soName;
       } else {
         symlinkVars["SONAME"] = "";
-        outputs.push_back(soName);
+        symlinks.push_back(soName);
       }
-      outputs.push_back(targetOutput);
+      symlinks.push_back(targetOutput);
       cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(),
                                       "Create library symlink " + targetOutput,
                                          "CMAKE_SYMLINK_LIBRARY",
-                                         outputs,
+                                         symlinks,
                                          cmNinjaDeps(1, targetOutputReal),
                                          emptyDeps,
                                          emptyDeps,

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list