[Cmake-commits] CMake branch, master, updated. v3.4.0-635-g5257a3b

[Brad King]

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, master has been updated
       via  5257a3b931e3a2edc3fbe262c8215af6e7f5bfd7 (commit)
       via  4e3cf8b012404e4d9602c16d473480cc3d0c7928 (commit)
       via  6b1852874325520a418eb05ec3c2149c2eb194a2 (commit)
      from  36e6ee913d7ea22060cc45b6a6a7b7e573402b28 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5257a3b931e3a2edc3fbe262c8215af6e7f5bfd7
commit 5257a3b931e3a2edc3fbe262c8215af6e7f5bfd7
Merge: 36e6ee9 4e3cf8b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 2 08:35:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 2 08:35:44 2015 -0500

    Merge topic 'reduce-realpath-calls'
    
    4e3cf8b0 cmOrderDirectories: Reduce repeat realpath() calls
    6b185287 cmOrderDirectories: Factor out directory comparison

diff --cc Source/cmOrderDirectories.cxx
index e3eedc7,e3406a8..61efd01
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@@ -637,5 -635,25 +635,25 @@@ void cmOrderDirectories::DiagnoseCycle(
    e << "Some of these libraries may not be found correctly.";
    this->GlobalGenerator->GetCMakeInstance()
      ->IssueMessage(cmake::WARNING, e.str(),
 -                   this->Target->Target->GetBacktrace());
 +                   this->Target->GetBacktrace());
  }
+ 
+ bool cmOrderDirectories::IsSameDirectory(std::string const& l,
+                                          std::string const& r)
+ {
+   return this->GetRealPath(l) == this->GetRealPath(r);
+ }
+ 
+ std::string const& cmOrderDirectories::GetRealPath(std::string const& dir)
+ {
+   std::map<std::string, std::string>::iterator i =
+     this->RealPaths.lower_bound(dir);
+   if (i == this->RealPaths.end() ||
+       this->RealPaths.key_comp()(dir, i->first))
+     {
+     typedef std::map<std::string, std::string>::value_type value_type;
+     i = this->RealPaths.insert(
+       i, value_type(dir, cmSystemTools::GetRealPath(dir)));
+     }
+   return i->second;
+ }

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

Summary of changes:
 Source/cmOrderDirectories.cxx |   26 ++++++++++++++++++++++----
 Source/cmOrderDirectories.h   |    6 ++++++
 2 files changed, 28 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake