[Cmake-commits] CMake branch, next, updated. v2.8.12-4779-gbe64fc1

[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  be64fc117fd6fa65db0649be1afb9348bb943aa0 (commit)
       via  13aea6d1753f02df11df45b8bf172ee496e406ed (commit)
      from  6ecc8d3e436d8cba5b8eb1c352e7e05035e9d919 (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=be64fc117fd6fa65db0649be1afb9348bb943aa0
commit be64fc117fd6fa65db0649be1afb9348bb943aa0
Merge: 6ecc8d3 13aea6d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 2 10:46:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 2 10:46:52 2013 -0400

    Merge topic 'revert-accidental-changes' into next
    
    13aea6d cmFindCommon: Revert accidental change


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13aea6d1753f02df11df45b8bf172ee496e406ed
commit 13aea6d1753f02df11df45b8bf172ee496e406ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 2 10:44:26 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 2 10:45:15 2013 -0400

    cmFindCommon: Revert accidental change
    
    In commit c4373b33 (cmTarget: Make GetProperty() const, 2013-10-29)
    we accidentally changed the cmFindCommon.cxx logic in a way that
    looks like a local experiment leftover that went unnoticed due to
    the size of the other changes in the commit.  Revert it.

diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 97a20ce..7beeda0 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -140,25 +140,14 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths)
     }
   const char* rootPath =
     this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
-  const char* osxRootPath =
-    this->Makefile->GetDefinition("_CMAKE_OSX_SYSROOT_PATH");
-  const bool noRootPath = !rootPath || !*rootPath;
-  const bool noOSXRootPath = !osxRootPath || !*osxRootPath;
-  if(noRootPath && noOSXRootPath)
+  if((rootPath == 0) || (strlen(rootPath) == 0))
     {
     return;
     }
 
   // Construct the list of path roots with no trailing slashes.
   std::vector<std::string> roots;
-  if(rootPath)
-    {
-    cmSystemTools::ExpandListArgument(rootPath, roots);
-    }
-  if(osxRootPath)
-    {
-    roots.push_back(osxRootPath);
-    }
+  cmSystemTools::ExpandListArgument(rootPath, roots);
   for(std::vector<std::string>::iterator ri = roots.begin();
       ri != roots.end(); ++ri)
     {

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

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


hooks/post-receive
-- 
CMake