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:17 (GMT)
commitbb4e2f3f9a401c0bfd2b536eb7a60aa5fbdd8608 (patch)
treef1601e00b556daae032b90b703a1be6b9d4fa87b
parente61d872839a84a5ab7a5e8489008ffed9b83782e (diff)
parent0356b81525019e054be5b6edc0c0f7ca51249f54 (diff)
downloadCMake-bb4e2f3f9a401c0bfd2b536eb7a60aa5fbdd8608.zip
CMake-bb4e2f3f9a401c0bfd2b536eb7a60aa5fbdd8608.tar.gz
CMake-bb4e2f3f9a401c0bfd2b536eb7a60aa5fbdd8608.tar.bz2
Merge topic 'find_package-check-dir' into release-3.19
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) {