[Cmake-commits] CMake branch, next, updated. v2.8.7-2469-g17ea393

Peter Collingbourne peter at pcc.me.uk
Sat Feb 4 21:05:59 EST 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  17ea393aa14be17eb7de9145bffbdfd332cda4a0 (commit)
       via  470d1db13c7a3c79f16b5092e1fa8bc968683b5d (commit)
       via  95c8a123f495a226f00c86f3bb4c44829bf53084 (commit)
      from  63d9a1c60f7510e1046a5898e9221cb5422644af (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=17ea393aa14be17eb7de9145bffbdfd332cda4a0
commit 17ea393aa14be17eb7de9145bffbdfd332cda4a0
Merge: 63d9a1c 470d1db
Author:     Peter Collingbourne <peter at pcc.me.uk>
AuthorDate: Sat Feb 4 21:05:53 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 4 21:05:53 2012 -0500

    Merge topic 'ninja-generator' into next
    
    470d1db Appease various compilers
    95c8a12 Remove some default arguments


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=470d1db13c7a3c79f16b5092e1fa8bc968683b5d
commit 470d1db13c7a3c79f16b5092e1fa8bc968683b5d
Author:     Peter Collingbourne <peter at pcc.me.uk>
AuthorDate: Sun Feb 5 01:48:08 2012 +0000
Commit:     Peter Collingbourne <peter at pcc.me.uk>
CommitDate: Sun Feb 5 01:48:08 2012 +0000

    Appease various compilers

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 8b633bf..7ff33ba 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -367,7 +367,7 @@ void cmGlobalNinjaGenerator::Generate()
 
   this->cmGlobalGenerator::Generate();
 
-  this->WriteAssumedSourceDependencies(*this->BuildFileStream);
+  this->WriteAssumedSourceDependencies();
   this->WriteTargetAliases(*this->BuildFileStream);
   this->WriteBuiltinTargets(*this->BuildFileStream);
 
@@ -591,15 +591,16 @@ void cmGlobalNinjaGenerator::AddDependencyToAll(cmTarget* target)
   this->AppendTargetOutputs(target, this->AllDependencies);
 }
 
-void cmGlobalNinjaGenerator::WriteAssumedSourceDependencies(std::ostream& os)
+void cmGlobalNinjaGenerator::WriteAssumedSourceDependencies()
 {
   for (std::map<std::string, std::set<std::string> >::iterator
        i = this->AssumedSourceDependencies.begin();
        i != this->AssumedSourceDependencies.end(); ++i) {
+    cmNinjaDeps deps;
+    std::copy(i->second.begin(), i->second.end(), std::back_inserter(deps));
     WriteCustomCommandBuild(/*command=*/"", /*description=*/"",
                             "Assume dependencies for generated source file.",
-                            cmNinjaDeps(1, i->first),
-                            cmNinjaDeps(i->second.begin(), i->second.end()));
+                            cmNinjaDeps(1, i->first), deps);
   }
 }
 
@@ -653,7 +654,7 @@ cmGlobalNinjaGenerator
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
     std::set<cmStdString> const& utils = target->GetUtilities();
-    outputs.insert(outputs.end(), utils.begin(), utils.end());
+    std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
     cmTargetDependSet const& targetDeps =
       this->GetTargetDirectDepends(*target);
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 171d14b..6f3c6b2 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -255,7 +255,7 @@ private:
 
   void AddDependencyToAll(cmTarget* target);
 
-  void WriteAssumedSourceDependencies(std::ostream& os);
+  void WriteAssumedSourceDependencies();
 
   void AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs);
   void AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs);
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index fee9cd0..8ef4d28 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -97,8 +97,8 @@ private:
 
   struct map_to_ninja_path {
     cmLocalNinjaGenerator *LocalGenerator;
-    map_to_ninja_path(cmLocalNinjaGenerator *LocalGenerator)
-      : LocalGenerator(LocalGenerator) {}
+    map_to_ninja_path(cmLocalNinjaGenerator *LocalGen)
+      : LocalGenerator(LocalGen) {}
     std::string operator()(const std::string &path) {
       return LocalGenerator->ConvertToNinjaPath(path.c_str());
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index d7f8ad7..4dd6a9b 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -281,6 +281,7 @@ cmNinjaNormalTargetGenerator
     default:
       assert(0 && "Unexpected target type");
   }
+  return std::vector<std::string>();
 }
 
 void cmNinjaNormalTargetGenerator::WriteLinkStatement()
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index bfe6f07..bf8194d 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -39,8 +39,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
       this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
 
       // Depend on all custom command outputs.
-      const std::vector<std::string>& outputs = cc->GetOutputs();
-      std::transform(outputs.begin(), outputs.end(),
+      const std::vector<std::string>& ccOutputs = cc->GetOutputs();
+      std::transform(ccOutputs.begin(), ccOutputs.end(),
                      std::back_inserter(deps), MapToNinjaPath());
       }
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95c8a123f495a226f00c86f3bb4c44829bf53084
commit 95c8a123f495a226f00c86f3bb4c44829bf53084
Author:     Peter Collingbourne <peter at pcc.me.uk>
AuthorDate: Sun Feb 5 01:48:01 2012 +0000
Commit:     Peter Collingbourne <peter at pcc.me.uk>
CommitDate: Sun Feb 5 01:48:01 2012 +0000

    Remove some default arguments

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 24900c5..8b633bf 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -767,8 +767,5 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
   WritePhonyBuild(os,
                   "A missing CMake input file is not an error.",
                   implicitDeps,
-                  cmNinjaDeps(),
-                  cmNinjaDeps(),
-                  cmNinjaDeps(),
-                  cmNinjaVars());
+                  cmNinjaDeps());
 }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 0a15834..bfe6f07 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -88,10 +88,7 @@ void cmNinjaUtilityTargetGenerator::Generate()
     cmGlobalNinjaGenerator::WritePhonyBuild(this->GetBuildFileStream(),
                                             "",
                                             outputs,
-                                            cmNinjaDeps(1, utilCommandName),
-                                            cmNinjaDeps(),
-                                            cmNinjaDeps(),
-                                            cmNinjaVars());
+                                            cmNinjaDeps(1, utilCommandName));
   }
 
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx        |   16 +++++++---------
 Source/cmGlobalNinjaGenerator.h          |    2 +-
 Source/cmLocalNinjaGenerator.h           |    4 ++--
 Source/cmNinjaNormalTargetGenerator.cxx  |    1 +
 Source/cmNinjaUtilityTargetGenerator.cxx |    9 +++------
 5 files changed, 14 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list