diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-30 11:25:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-30 11:25:53 (GMT) |
| commit | e9f667c3b02711e295d41a6a328d002aa2122c09 (patch) | |
| tree | ad0e9340f590c52af93a21d835087ba7fdc9e757 /Source | |
| parent | e23428c99f146699dbcc724c45837cd61bc13ae7 (diff) | |
| parent | f2c903fb9a02b129c6673385363f2a99f2f153ce (diff) | |
| download | CMake-e9f667c3b02711e295d41a6a328d002aa2122c09.zip CMake-e9f667c3b02711e295d41a6a328d002aa2122c09.tar.gz CMake-e9f667c3b02711e295d41a6a328d002aa2122c09.tar.bz2 | |
Merge topic 'find_library-file-readable' into release-3.18
f2c903fb9a find_library: Check that library files are readable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4945
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindLibraryCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index 31f1201..3242b6d 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -433,7 +433,8 @@ bool cmFindLibraryHelper::CheckDirectoryForName(std::string const& path, #endif if (name.Regex.find(testName)) { this->TestPath = cmStrCat(path, origName); - if (!cmSystemTools::FileIsDirectory(this->TestPath)) { + // Make sure the path is readable and is not a directory. + if (cmSystemTools::FileExists(this->TestPath, true)) { this->DebugLibraryFound(name.Raw, dir); // This is a matching file. Check if it is better than the |