ENH: Started implementing INSTALL(DIRECTORY) command mode. This is not yet finished so it is undocumented and there is no test. These changes also separate the notions of file and directory permissions.

1 files changed, 4 insertions, 3 deletions

diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index 7990b2ac68..fd857a5075 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -22,12 +22,12 @@
 cmInstallFilesGenerator
 ::cmInstallFilesGenerator(std::vector<std::string> const& files,
                           const char* dest, bool programs,
-                          const char* permissions,
+                          const char* file_permissions,
                           std::vector<std::string> const& configurations,
                           const char* component,
                           const char* rename):
   Files(files), Destination(dest), Programs(programs),
-  Permissions(permissions), Configurations(configurations),
+  FilePermissions(file_permissions), Configurations(configurations),
   Component(component), Rename(rename)
 {
 }
@@ -47,12 +47,13 @@ void cmInstallFilesGenerator::GenerateScript(std::ostream& os)
     {
     bool not_optional = false;
     const char* no_properties = 0;
+    const char* no_dir_permissions = 0;
     this->AddInstallRule(os, this->Destination.c_str(),
                          (this->Programs
                           ? cmTarget::INSTALL_PROGRAMS
                           : cmTarget::INSTALL_FILES), fi->c_str(),
                          not_optional, no_properties,
-                         this->Permissions.c_str(),
+                         this->FilePermissions.c_str(), no_dir_permissions,
                          this->Configurations,
                          this->Component.c_str(),
                          this->Rename.c_str());