summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-02 14:44:26 (GMT)
committerBrad King <brad.king@kitware.com>2013-11-02 14:45:15 (GMT)
commit13aea6d1753f02df11df45b8bf172ee496e406ed (patch)
tree2c0004370e03ebb1f8f35522bc2f298e0cf3345e
parent4064d6f216ff6090d2da5797059df13924cc3589 (diff)
downloadCMake-13aea6d1753f02df11df45b8bf172ee496e406ed.zip
CMake-13aea6d1753f02df11df45b8bf172ee496e406ed.tar.gz
CMake-13aea6d1753f02df11df45b8bf172ee496e406ed.tar.bz2
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.
-rw-r--r--Source/cmFindCommon.cxx15
1 files changed, 2 insertions, 13 deletions
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)
{