diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-19 13:34:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-19 13:34:20 (GMT) |
| commit | e7d328759001f555dc5130c1d9c9f2cd7f411455 (patch) | |
| tree | 8078f8e8ec865c061bd64151e23fb1835adde9ba /Source | |
| parent | 0b3a792bef76b85f2350fa244b7f7e033fb9ccac (diff) | |
| parent | f6cae4ea06501827c3f4e5907fdb83d5d61f545b (diff) | |
| download | CMake-e7d328759001f555dc5130c1d9c9f2cd7f411455.zip CMake-e7d328759001f555dc5130c1d9c9f2cd7f411455.tar.gz CMake-e7d328759001f555dc5130c1d9c9f2cd7f411455.tar.bz2 | |
Merge topic 'minor-cleanups'
f6cae4ea Tests: Remove some trailing black lines.
c0ea4c5c Makefile: Fix comment indentation.
5e0c73c7 cmGlobalGenerator: Remove unused variable.
907c09cd include_directory: Add missing include.
a74d125a Help: Fix typo
317d8498 Small typo fix
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTargetIncludeDirectoriesCommand.cxx | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 0c44681..4f3328d 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2912,7 +2912,6 @@ void cmGlobalGenerator::WriteSummary() cmGeneratedFileStream fout(fname.c_str()); // Generate summary information files for each target. - std::string dir; for(std::map<cmStdString,cmTarget *>::const_iterator ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti) { diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 7f90078..c3ca85d 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -344,7 +344,7 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags() // write language flags for target std::set<cmStdString> languages; this->Target->GetLanguages(languages); - // put the compiler in the rules.make file so that if it changes + // put the compiler in the rules.make file so that if it changes // things rebuild for(std::set<cmStdString>::const_iterator l = languages.begin(); l != languages.end(); ++l) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index ab194c3..dfb310e 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1512,7 +1512,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename, } else { - std::cerr << "AUTOGEN: error: " << absFilename << " The file " + std::cerr << "AUTOGEN: error: " << absFilename << ": The file " << "includes the moc file \"" << currentMoc << "\", " << "but could not find header \"" << basename << '{' << this->Join(headerExtensions, ',') << "}\" "; diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx index 913bdab..f8e1188 100644 --- a/Source/cmTargetIncludeDirectoriesCommand.cxx +++ b/Source/cmTargetIncludeDirectoriesCommand.cxx @@ -11,6 +11,8 @@ ============================================================================*/ #include "cmTargetIncludeDirectoriesCommand.h" +#include "cmGeneratorExpression.h" + //---------------------------------------------------------------------------- bool cmTargetIncludeDirectoriesCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) |