kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'minor-cleanups'

Browse Source 
3942ec32 cmMakefileTargetGenerator: Remove unused variable.
a034dc0d cmGeneratorExpressionNode: Remove unused variable.
aeb74ae9 Fix include guard.
This commit is contained in:
Brad King 2015-07-29 10:29:32 -04:00 committed by CMake Topic Stage
commit 22b8f23849
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmExportTryCompileFileGenerator.h
View File

@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information. See the License for more information.
============================================================================*/ ============================================================================*/
#ifndef cmExportInstallFileGenerator_h #ifndef cmExportTryCompileFileGenerator_h
#define cmExportInstallFileGenerator_h #define cmExportTryCompileFileGenerator_h
#include "cmExportFileGenerator.h" #include "cmExportFileGenerator.h"

2
Source/cmGeneratorExpressionNode.cxx
View File

@ -1369,8 +1369,6 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
bool evalLL = dagChecker && dagChecker->EvaluatingLinkLibraries(); bool evalLL = dagChecker && dagChecker->EvaluatingLinkLibraries();
std::string result;
for (LangMap::const_iterator lit = testedFeatures.begin(); for (LangMap::const_iterator lit = testedFeatures.begin();
lit != testedFeatures.end(); ++lit) lit != testedFeatures.end(); ++lit)
{ {

1
Source/cmMakefileTargetGenerator.cxx
View File

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