ENH: Added OPTIONAL option to INSTALL command to allow installation of files if they exist while ignoring them otherwise. This addresses bug#2922.

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index fd857a5075..075285c25e 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -25,10 +25,11 @@ cmInstallFilesGenerator
                           const char* file_permissions,
                           std::vector<std::string> const& configurations,
                           const char* component,
-                          const char* rename):
+                          const char* rename,
+                          bool optional):
   Files(files), Destination(dest), Programs(programs),
   FilePermissions(file_permissions), Configurations(configurations),
-  Component(component), Rename(rename)
+  Component(component), Rename(rename), Optional(optional)
 {
 }
 
@@ -45,14 +46,13 @@ void cmInstallFilesGenerator::GenerateScript(std::ostream& os)
   for(std::vector<std::string>::const_iterator fi = this->Files.begin();
       fi != this->Files.end(); ++fi)
     {
-    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->Optional, no_properties,
                          this->FilePermissions.c_str(), no_dir_permissions,
                          this->Configurations,
                          this->Component.c_str(),