From 5fb58b8686d17efdda36d3b50bb099c86b771af3 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 18 Jul 2013 11:46:50 +0200 Subject: [PATCH 1/2] Don't add trailing whitespace to error message. --- Source/cmTarget.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 70500cdaf..12cab8a0e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3206,7 +3206,7 @@ static void processIncludeDirectories(cmTarget *tgt, { e << "Target \"" << (*it)->TargetName << "\" contains relative " "path in its INTERFACE_INCLUDE_DIRECTORIES:\n" - " \"" << *li << "\" "; + " \"" << *li << "\""; } else { From 8f5b402aa21af08d6df3d697cc6f744797eee660 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 18 Jul 2013 11:49:11 +0200 Subject: [PATCH 2/2] Remove TODO to uniq COMPILE_OPTIONS Compile options should not be passed through a uniq filter because repeated use of an option may have siginificance. --- Source/cmLocalGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 4e871d690..b187d6b84 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1380,7 +1380,7 @@ void cmLocalGenerator::AddCompileOptions( // COMPILE_FLAGS are not escaped for historical reasons. this->AppendFlags(flags, targetFlags); } - std::vector opts; // TODO: Emitted. + std::vector opts; target->GetCompileOptions(opts, config); for(std::vector::const_iterator i = opts.begin(); i != opts.end(); ++i)