[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4041-g0fe513e

Stephen Kelly steveire at gmail.com
Thu Aug 29 04:34:08 EDT 2013


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  0fe513e799a61149718091382f385c0199e179c5 (commit)
       via  5e15f398860712930387b78e36a7ae5ab8a9b775 (commit)
      from  e5e48ea4e11e2f5d4674097ae486dcfdbc011527 (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=0fe513e799a61149718091382f385c0199e179c5
commit 0fe513e799a61149718091382f385c0199e179c5
Merge: e5e48ea 5e15f39
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 29 04:34:02 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 29 04:34:02 2013 -0400

    Merge topic 'normalize-system-includes-check' into next
    
    5e15f39 Normalize system directories from the interface target property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e15f398860712930387b78e36a7ae5ab8a9b775
commit 5e15f398860712930387b78e36a7ae5ab8a9b775
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 29 10:28:52 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 29 10:28:52 2013 +0200

    Normalize system directories from the interface target property
    
    The input dir being tested is normalized, so ensure that the entries
    in the vector are normalized too (eg no trailing slash).

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5ce0e6b..62ac263 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -80,6 +80,12 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir,
                                         config, false, this->Target,
                                         &dagChecker), result);
       }
+    for(std::vector<std::string>::iterator li = result.begin();
+        li != result.end(); ++li)
+      {
+      cmSystemTools::ConvertToUnixSlashes(*li);
+      }
+
     IncludeCacheType::value_type entry(config_upper, result);
     iter = this->SystemIncludesCache.insert(entry).first;
     }

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list