[Cmake-commits] CMake branch, next, updated. v3.2.2-3097-g062e1c6

[Stephen Kelly]

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  062e1c69aa4ce55ca94cf33d68e26e4a685ec5ef (commit)
       via  ad167479270e55151df54603496f6ee6bd3b0e42 (commit)
       via  aaeec642ca9dfaf301c9a4c38e4b513564c41a5f (commit)
      from  0ddf23cfaaa5c4da850129b0678c6169e870cca4 (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=062e1c69aa4ce55ca94cf33d68e26e4a685ec5ef
commit 062e1c69aa4ce55ca94cf33d68e26e4a685ec5ef
Merge: 0ddf23c ad16747
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 05:10:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 24 05:10:11 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    ad167479 foreach: Remove unused variables.
    aaeec642 cmGlobalGenerator: De-virtualize methods with no overrides.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad167479270e55151df54603496f6ee6bd3b0e42
commit ad167479270e55151df54603496f6ee6bd3b0e42
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 11:07:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 11:09:59 2015 +0200

    foreach: Remove unused variables.

diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 8e3510d..0dcda4d 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -44,8 +44,6 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       std::vector<std::string>::const_iterator j = this->Args.begin();
       ++j;
 
-      std::string tmps;
-      cmListFileArgument arg;
       for( ; j != this->Args.end(); ++j)
         {
         // set the variable to the loop value

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaeec642ca9dfaf301c9a4c38e4b513564c41a5f
commit aaeec642ca9dfaf301c9a4c38e4b513564c41a5f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:52:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 11:09:58 2015 +0200

    cmGlobalGenerator: De-virtualize methods with no overrides.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index f9ea449..56574b8 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -121,7 +121,7 @@ public:
    * Try running cmake and building a file. This is used for dynamically
    * loaded commands, not as part of the usual build process.
    */
-  virtual int TryCompile(const std::string& srcdir, const std::string& bindir,
+  int TryCompile(const std::string& srcdir, const std::string& bindir,
                          const std::string& projectName,
                          const std::string& targetName,
                          bool fast, std::string& output, cmMakefile* mf);
@@ -371,7 +371,7 @@ protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
   // for a project collect all its targets by following depend
   // information, and also collect all the targets
-  virtual void GetTargetSets(TargetDependSet& projectTargets,
+  void GetTargetSets(TargetDependSet& projectTargets,
                              TargetDependSet& originalTargets,
                              cmLocalGenerator* root, GeneratorVector const&);
   bool IsRootOnlyTarget(cmTarget* target) const;
@@ -446,7 +446,7 @@ protected:
   TargetMap ImportedTargets;
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 
-  virtual const char* GetPredefinedTargetsFolder();
+  const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
 
 private:

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

Summary of changes:


hooks/post-receive
-- 
CMake