[Cmake-commits] CMake branch, next, updated. v3.3.0-1499-gf83e8cf

[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  f83e8cf401a89f8643567b2036b22f2ff4af0101 (commit)
       via  3942ec32ddd977ca899a129b8a9821284fd3df5f (commit)
       via  a034dc0df4b74d13cdba29e58f4b6afd0dc160d6 (commit)
       via  aeb74ae9f9f5289336b2603022cc86cf6316a946 (commit)
      from  918362e1aa1cd4774ab206a5886dd010081c445c (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=f83e8cf401a89f8643567b2036b22f2ff4af0101
commit f83e8cf401a89f8643567b2036b22f2ff4af0101
Merge: 918362e 3942ec3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 28 14:10:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 28 14:10:02 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    3942ec32 cmMakefileTargetGenerator: Remove unused variable.
    a034dc0d cmGeneratorExpressionNode: Remove unused variable.
    aeb74ae9 Fix include guard.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3942ec32ddd977ca899a129b8a9821284fd3df5f
commit 3942ec32ddd977ca899a129b8a9821284fd3df5f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 28 20:08:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 28 20:08:11 2015 +0200

    cmMakefileTargetGenerator: Remove unused variable.

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0f82fb3..6cc2378 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -414,7 +414,6 @@ void cmMakefileTargetGenerator
   // we compute some depends when writing the depend.make that we will also
   // use in the build.make, same with depMakeFile
   std::vector<std::string> depends;
-  std::string depMakeFile;
 
   // generate the build rule file
   this->WriteObjectBuildFile(obj, lang, source, depends);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a034dc0df4b74d13cdba29e58f4b6afd0dc160d6
commit a034dc0df4b74d13cdba29e58f4b6afd0dc160d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 28 20:07:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 28 20:07:46 2015 +0200

    cmGeneratorExpressionNode: Remove unused variable.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 3daa7b8..f3527ff 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1369,8 +1369,6 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
 
     bool evalLL = dagChecker && dagChecker->EvaluatingLinkLibraries();
 
-    std::string result;
-
     for (LangMap::const_iterator lit = testedFeatures.begin();
           lit != testedFeatures.end(); ++lit)
       {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aeb74ae9f9f5289336b2603022cc86cf6316a946
commit aeb74ae9f9f5289336b2603022cc86cf6316a946
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 27 22:56:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 28 20:06:38 2015 +0200

    Fix include guard.

diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 0d84896..749f3ef 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef cmExportInstallFileGenerator_h
-#define cmExportInstallFileGenerator_h
+#ifndef cmExportTryCompileFileGenerator_h
+#define cmExportTryCompileFileGenerator_h
 
 #include "cmExportFileGenerator.h"
 

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

Summary of changes:
 Source/cmExportTryCompileFileGenerator.h |    4 ++--
 Source/cmGeneratorExpressionNode.cxx     |    2 --
 Source/cmMakefileTargetGenerator.cxx     |    1 -
 3 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake