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

Merge topic 'minor-cleanups' 

8f5b402 Remove TODO to uniq COMPILE_OPTIONS
5fb58b8 Don't add trailing whitespace to error message.
This commit is contained in:
Brad King 2013-07-24 11:02:24 -04:00 committed by CMake Topic Stage
parent 571d050415 8f5b402aa2
commit a52f00e07c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.cxx
View File

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

2
Source/cmTarget.cxx
View File

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