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

6 files changed, 6 insertions, 7 deletions

diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 887047ccee..376b56cc40 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -84,7 +84,7 @@ In some implementations, algorithms operating on iterators to a container of
   const char* dir = /*...*/;
   std::vector<std::string> vec;
   // ...
-  std::binary_find(vec.begin(), vec.end(), dir); // Wrong
+  std::binary_search(vec.begin(), vec.end(), dir); // Wrong
 
 The ``std::string`` may need to be explicitly constructed:
 
@@ -93,7 +93,7 @@ The ``std::string`` may need to be explicitly constructed:
   const char* dir = /*...*/;
   std::vector<std::string> vec;
   // ...
-  std::binary_find(vec.begin(), vec.end(), std::string(dir)); // Ok
+  std::binary_search(vec.begin(), vec.end(), std::string(dir)); // Ok
 
 std::auto_ptr
 -------------
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 0c4468188a..4f3328d023 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 7f900784cf..c3ca85d5ae 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 ab194c35ee..dfb310e541 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 913bdaba2b..f8e1188a7b 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 &)
diff --git a/Tests/SystemInformation/CMakeLists.txt b/Tests/SystemInformation/CMakeLists.txt
index 838fd4aa19..c33380f51d 100644
--- a/Tests/SystemInformation/CMakeLists.txt
+++ b/Tests/SystemInformation/CMakeLists.txt
@@ -57,5 +57,3 @@ endforeach()
 get_directory_property(res INCLUDE_REGULAR_EXPRESSION)
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/OtherProperties.txt
   "INCLUDE_REGULAR_EXPRESSION: ${res}\n")
-
-