diff options
Diffstat (limited to 'Source/cmInstallFilesGenerator.cxx')
| -rw-r--r-- | Source/cmInstallFilesGenerator.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index 7990b2a..075285c 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -22,13 +22,14 @@ 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): + const char* rename, + bool optional): Files(files), Destination(dest), Programs(programs), - Permissions(permissions), Configurations(configurations), - Component(component), Rename(rename) + FilePermissions(file_permissions), Configurations(configurations), + Component(component), Rename(rename), Optional(optional) { } @@ -45,14 +46,14 @@ 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->Permissions.c_str(), + this->Optional, no_properties, + this->FilePermissions.c_str(), no_dir_permissions, this->Configurations, this->Component.c_str(), this->Rename.c_str()); |