Просмотр исходного кода

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.
Brad King 12 лет назад
Родитель
Сommit
13aea6d175
1 измененных файлов с 2 добавлено и 13 удалено
  1. 2 13
      Source/cmFindCommon.cxx

+ 2 - 13
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)
     {