diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-24 15:02:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-24 15:02:24 (GMT) |
| commit | a52f00e07cf6785c4b76573ad2cf78397ea7bd29 (patch) | |
| tree | 4d1a887f253df55e0f4f1e8ea515ac25a27c42fd | |
| parent | 571d050415dce07fe2ea0062eb300af36ca2d5e1 (diff) | |
| parent | 8f5b402aa21af08d6df3d697cc6f744797eee660 (diff) | |
| download | CMake-a52f00e07cf6785c4b76573ad2cf78397ea7bd29.zip CMake-a52f00e07cf6785c4b76573ad2cf78397ea7bd29.tar.gz CMake-a52f00e07cf6785c4b76573ad2cf78397ea7bd29.tar.bz2 | |
Merge topic 'minor-cleanups'
8f5b402 Remove TODO to uniq COMPILE_OPTIONS
5fb58b8 Don't add trailing whitespace to error message.
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 4e871d6..b187d6b 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<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) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index f8cecd1..1df9f2b 100644 --- a/Source/cmTarget.cxx +++ b/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 { |