summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-05-10 14:10:58 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-05-10 14:11:04 (GMT)
commit3dd38ac36d49c4eea319b9813bbd1f66a7b0fb29 (patch)
treeb5113f2c0286b0aa268a7f0a9f7291b63297b1e3 /Source
parent74d35f569316fcd09e1604ac87e53bfb16367a8d (diff)
parentd71a7cc19d6e03f89581efdaa8d63db216184d40 (diff)
downloadCMake-3dd38ac36d49c4eea319b9813bbd1f66a7b0fb29.zip
CMake-3dd38ac36d49c4eea319b9813bbd1f66a7b0fb29.tar.gz
CMake-3dd38ac36d49c4eea319b9813bbd1f66a7b0fb29.tar.bz2
Merge topic 'install-symlink-to-directory'
d71a7cc19d install(FILES): Allow installation of symlinks to directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6098
Diffstat (limited to 'Source')
-rw-r--r--Source/cmInstallCommand.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 7788db3..8a34f91 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -1482,7 +1482,8 @@ bool Helper::MakeFilesFullPath(const char* modeName,
}
// Make sure the file is not a directory.
- if (gpos == std::string::npos && cmSystemTools::FileIsDirectory(file)) {
+ if (gpos == std::string::npos && !cmSystemTools::FileIsSymlink(file) &&
+ cmSystemTools::FileIsDirectory(file)) {
this->SetError(
cmStrCat(modeName, " given directory \"", relFile, "\" to install."));
return false;