[Cmake-commits] CMake branch, next, updated. v2.8.5-1978-ge61429c

[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, next has been updated
       via  e61429ccdb3548bfea18a8dd311659cef2c82979 (commit)
       via  0089cf69323b4008d722dae1ceec314ff8b65ffd (commit)
      from  8751cb9bbaa17902a9ffe30b18cfc2f1c7dce25c (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=e61429ccdb3548bfea18a8dd311659cef2c82979
commit e61429ccdb3548bfea18a8dd311659cef2c82979
Merge: 8751cb9 0089cf6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 15:32:31 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 28 15:32:31 2011 -0400

    Merge topic 'find_package-win-prefix-issue-12475' into next
    
    0089cf6 Revert "Windows: Do not search root-relative paths (#12475)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0089cf69323b4008d722dae1ceec314ff8b65ffd
commit 0089cf69323b4008d722dae1ceec314ff8b65ffd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 15:32:04 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 15:32:04 2011 -0400

    Revert "Windows: Do not search root-relative paths (#12475)"
    
    This reverts commit 9149033c99b53c1e9c8e9c77e8a9165d745f1be5.

diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 2755bee..b44864e 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -473,13 +473,7 @@ void cmFindCommon::AddPathInternal(std::string const& in_path,
 //----------------------------------------------------------------------------
 void cmFindCommon::ComputeFinalPaths()
 {
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define cmFindCommon_ComputeFinalPaths_WindowsPaths
-  std::vector<std::string> paths;
-  this->SearchPaths.swap(paths);
-#else
   std::vector<std::string>& paths = this->SearchPaths;
-#endif
 
   // Expand list of paths inside all search roots.
   this->RerootPaths(paths);
@@ -493,13 +487,6 @@ void cmFindCommon::ComputeFinalPaths()
       {
       p += "/";
       }
-#ifdef cmFindCommon_ComputeFinalPaths_WindowsPaths
-    // Exclude "root-relative" paths starting in a single slash.
-    if(p.size() >= 2 && (p[0] != '/' || p[1] == '/'))
-      {
-      this->SearchPaths.push_back(p);
-      }
-#endif
     }
 }
 

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

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


hooks/post-receive
-- 
CMake