summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-12-28 17:01:37 (GMT)
committerBrad King <brad.king@kitware.com>2007-12-28 17:01:37 (GMT)
commit0a7bb4112954068b25adc116f9cf6c0baeb6cf3e (patch)
tree559032487f4cc3ba88f9e5c603255ba4e649cffa
parentf4fb1a4f91ead40d04cfed4a570e25821a1e37ef (diff)
downloadCMake-0a7bb4112954068b25adc116f9cf6c0baeb6cf3e.zip
CMake-0a7bb4112954068b25adc116f9cf6c0baeb6cf3e.tar.gz
CMake-0a7bb4112954068b25adc116f9cf6c0baeb6cf3e.tar.bz2
ENH: Make FIND_* commands look in the CMAKE_PREFIX_PATH directories directly after looking in each command's specific subdirectory (/include, /lib, or /bin). This may be useful on Windows where projects could be installed in a single directory. See issue #4947.
-rw-r--r--Source/cmFindBase.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 9881243..dea1642 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -603,6 +603,10 @@ void cmFindBase::AddFindPrefix(std::vector<std::string>& dest,
dirWithSubdir += "/sbin";
dest.push_back(dirWithSubdir);
}
+ if(!subdir.empty())
+ {
+ dest.push_back(*it);
+ }
}
}