summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-10-20 13:38:04 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-10-20 13:38:18 (GMT)
commit2fb0768dc00bee980612fd5e59a566b0903b1863 (patch)
tree0bd3734ab54b6be4cdf996181cc50c9081e6b3cf
parent7bac94e38c7ced903919b1ac1b34c673125629d5 (diff)
parent0356b81525019e054be5b6edc0c0f7ca51249f54 (diff)
downloadCMake-2fb0768dc00bee980612fd5e59a566b0903b1863.zip
CMake-2fb0768dc00bee980612fd5e59a566b0903b1863.tar.gz
CMake-2fb0768dc00bee980612fd5e59a566b0903b1863.tar.bz2
Merge topic 'find_package-check-dir'
0356b81525 find_package: Fix regression in searching root prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5396
-rw-r--r--Source/cmFindPackageCommand.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index c988b59..92b1e80 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1984,7 +1984,7 @@ cmFileListGeneratorBase* cmFileListGeneratorBase::SetNext(
bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
cmFileList& listing)
{
- if (!cmSystemTools::FileIsDirectory(fullPath)) {
+ if (!fullPath.empty() && !cmSystemTools::FileIsDirectory(fullPath)) {
return false;
}
if (this->Next) {