Merge topic 'minor-cleanups'

8f5b402 Remove TODO to uniq COMPILE_OPTIONS
5fb58b8 Don't add trailing whitespace to error message.

Source/cmLocalGenerator.cxx

@@ -1380,7 +1380,7 @@ void cmLocalGenerator::AddCompileOptions(
       // COMPILE_FLAGS are not escaped for historical reasons.
       this->AppendFlags(flags, targetFlags);
       }
-    std::vector<std::string> opts; // TODO: Emitted.
+    std::vector<std::string> opts;
     target->GetCompileOptions(opts, config);
     for(std::vector<std::string>::const_iterator i = opts.begin();
         i != opts.end(); ++i)

Source/cmTarget.cxx

@@ -3203,7 +3203,7 @@ static void processIncludeDirectories(cmTarget *tgt,
           {
           e << "Target \"" << (*it)->TargetName << "\" contains relative "
             "path in its INTERFACE_INCLUDE_DIRECTORIES:\n"
-            "  \"" << *li << "\" ";
+            "  \"" << *li << "\"";
           }
         else
           {