[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6632-g8bbb564

Stephen Kelly steveire at gmail.com
Fri Jan 3 06:17:33 EST 2014


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  8bbb564d6cff9a38c85397fcdacebefbb24df135 (commit)
       via  48b09479a3c99613b6b3c9364ee3c5e8347018a1 (commit)
      from  8e770159574ef0ee29a2b546cfb3405d04c40f31 (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=8bbb564d6cff9a38c85397fcdacebefbb24df135
commit 8bbb564d6cff9a38c85397fcdacebefbb24df135
Merge: 8e77015 48b0947
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 3 06:17:30 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 3 06:17:30 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    48b0947 dashboard.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48b09479a3c99613b6b3c9364ee3c5e8347018a1
commit 48b09479a3c99613b6b3c9364ee3c5e8347018a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 3 12:01:36 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jan 3 12:01:57 2014 +0100

    dashboard.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 22913fa..6894cfc 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -190,7 +190,9 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir,
     iter = this->SystemIncludesCache.insert(entry).first;
     }
 
-  return std::binary_search(iter->second.begin(), iter->second.end(), dir);
+  std::string dirString = dir;
+  return std::binary_search(iter->second.begin(), iter->second.end(),
+                            dirString);
 }
 
 //----------------------------------------------------------------------------

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list