mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

install: Set permissions on directories created by install(DIRECTORY)

Browse Source 
The directories that are implicitly created by install(DIRECTORY)
were not having their permissions being set by
CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS. This change refactors
cmFileCopier to take this into account for directory installation.
This commit is contained in:
Kyle Edwards
2018-10-01 16:13:06 -04:00
parent fbd89b6753
commit 5e61b79b82
1 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileCommand.cxx
+38 -18
View File
@@ -1275,6 +1275,33 @@ protected:
this->DirPermissions |= mode_world_read; this->DirPermissions |= mode_world_read;
this->DirPermissions |= mode_world_execute; this->DirPermissions |= mode_world_execute;
} }
bool GetDefaultDirectoryPermissions(mode_t** mode)
{
// check if default dir creation permissions were set
const char* default_dir_install_permissions =
this->Makefile->GetDefinition(
"CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS");
if (default_dir_install_permissions && *default_dir_install_permissions) {
std::vector<std::string> items;
cmSystemTools::ExpandListArgument(default_dir_install_permissions,
items);
for (const auto& arg : items) {
if (!this->CheckPermissions(arg, **mode)) {
std::ostringstream e;
e << this->FileCommand->GetError()
<< " Set with CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS "
"variable.";
this->FileCommand->SetError(e.str());
return false;
}
}
} else {
*mode = nullptr;
}
return true;
}
}; };
bool cmFileCopier::Parse(std::vector<std::string> const& args) bool cmFileCopier::Parse(std::vector<std::string> const& args)
@@ -1668,8 +1695,15 @@ bool cmFileCopier::InstallDirectory(const char* source,
this->ReportCopy(destination, TypeDir, this->ReportCopy(destination, TypeDir,
!cmSystemTools::FileIsDirectory(destination)); !cmSystemTools::FileIsDirectory(destination));
// check if default dir creation permissions were set
mode_t default_dir_mode_v = 0;
mode_t* default_dir_mode = &default_dir_mode_v;
if (!this->GetDefaultDirectoryPermissions(&default_dir_mode)) {
return false;
}
// Make sure the destination directory exists. // Make sure the destination directory exists.
if (!cmSystemTools::MakeDirectory(destination)) { if (!cmSystemTools::MakeDirectory(destination, default_dir_mode)) {
std::ostringstream e; std::ostringstream e;
e << this->Name << " cannot make directory \"" << destination e << this->Name << " cannot make directory \"" << destination
<< "\": " << cmSystemTools::GetLastSystemError(); << "\": " << cmSystemTools::GetLastSystemError();
@@ -2073,23 +2107,9 @@ bool cmFileInstaller::HandleInstallDestination()
// check if default dir creation permissions were set // check if default dir creation permissions were set
mode_t default_dir_mode_v = 0; mode_t default_dir_mode_v = 0;
mode_t* default_dir_mode = nullptr; mode_t* default_dir_mode = &default_dir_mode_v;
const char* default_dir_install_permissions = this->Makefile->GetDefinition( if (!this->GetDefaultDirectoryPermissions(&default_dir_mode)) {
"CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS"); return false;
if (default_dir_install_permissions && *default_dir_install_permissions) {
std::vector<std::string> items;
cmSystemTools::ExpandListArgument(default_dir_install_permissions, items);
for (const auto& arg : items) {
if (!this->CheckPermissions(arg, default_dir_mode_v)) {
std::ostringstream e;
e << this->FileCommand->GetError()
<< " Set with CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS variable.";
this->FileCommand->SetError(e.str());
return false;
}
}
default_dir_mode = &default_dir_mode_v;
} }
if (this->InstallType != cmInstallType_DIRECTORY) { if (this->InstallType != cmInstallType_DIRECTORY) {