[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3208-g034ee46

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  034ee4600765358592ec365fe5c26b9393710e4b (commit)
       via  8f5b402aa21af08d6df3d697cc6f744797eee660 (commit)
       via  5fb58b8686d17efdda36d3b50bb099c86b771af3 (commit)
      from  7144b791229898ced9bd3fcee1a5b4e68f3ecc3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=034ee4600765358592ec365fe5c26b9393710e4b
commit 034ee4600765358592ec365fe5c26b9393710e4b
Merge: 7144b79 8f5b402
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 18 11:19:20 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 18 11:19:20 2013 -0400

    Merge topic 'minor-cleanups' into next
    
    8f5b402 Remove TODO to uniq COMPILE_OPTIONS
    5fb58b8 Don't add trailing whitespace to error message.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f5b402aa21af08d6df3d697cc6f744797eee660
commit 8f5b402aa21af08d6df3d697cc6f744797eee660
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 18 11:49:11 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 18 11:49:11 2013 +0200

    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.

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)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fb58b8686d17efdda36d3b50bb099c86b771af3
commit 5fb58b8686d17efdda36d3b50bb099c86b771af3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 18 11:46:50 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 18 11:46:50 2013 +0200

    Don't add trailing whitespace to error message.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 70500cd..12cab8a 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
           {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalGenerator.cxx |    2 +-
 Source/cmTarget.cxx         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake