ENH: Implemented INSTALL(DIRECTORY) command and added a test. Re-organized cmFileCommand's implementation of FILE(INSTALL) a bit to help out. This addresses bug#1694 and partially addresses bug#2691.

1 files changed, 5 insertions, 3 deletions

diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index 9ff09a6f82..aaf82358f2 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -25,10 +25,12 @@ cmInstallDirectoryGenerator
                               const char* file_permissions,
                               const char* dir_permissions,
                               std::vector<std::string> const& configurations,
-                              const char* component):
+                              const char* component,
+                              const char* literal_args):
   Directories(dirs), Destination(dest),
   FilePermissions(file_permissions), DirPermissions(dir_permissions),
-  Configurations(configurations), Component(component)
+  Configurations(configurations), Component(component),
+  LiteralArguments(literal_args)
 {
 }
 
@@ -54,6 +56,6 @@ void cmInstallDirectoryGenerator::GenerateScript(std::ostream& os)
                          this->FilePermissions.c_str(),
                          this->DirPermissions.c_str(),
                          this->Configurations, this->Component.c_str(),
-                         no_rename);
+                         no_rename, this->LiteralArguments.c_str());
     }
 }