kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2013-11-02 10:44:26 -04:00
parent 4064d6f216
commit 13aea6d175
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmFindCommon.cxx
View File

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