summaryrefslogtreecommitdiff
path: root/Source/cmInstallDirectoryGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-06-28 16:11:18 -0400
committerBrad King <brad.king@kitware.com>2007-06-28 16:11:18 -0400
commitfdf7b203af156f08bf149b35d0b54573d4b25abf (patch)
treed73c95726631536288f9efd46a704f2d5b11b3c8 /Source/cmInstallDirectoryGenerator.cxx
parent33e9becd6f1a8343d347611c2037bd980ea41690 (diff)
downloadcmake-fdf7b203af156f08bf149b35d0b54573d4b25abf.tar.gz
ENH: First step of install script generator cleanup. Each configuration to be installed is now separately handled instead of using variables to store per-configuration names. For targets the component and configuration install-time tests are now done in the install script instead of in the FILE(INSTALL) command. This cleans things up like not trying to strip a file that was optionally not installed. It also simplifies the code for install_name adjustment on OSX. This commit is surrounded by the tags CMake-InstallGeneratorCleanup1-pre and CMake-InstallGeneratorCleanup1-post.
Diffstat (limited to 'Source/cmInstallDirectoryGenerator.cxx')
-rw-r--r--Source/cmInstallDirectoryGenerator.cxx25
1 files changed, 11 insertions, 14 deletions
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index 6d25cb727c..1a80c467ea 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -44,18 +44,15 @@ cmInstallDirectoryGenerator
void cmInstallDirectoryGenerator::GenerateScript(std::ostream& os)
{
// Write code to install the directories.
- for(std::vector<std::string>::const_iterator di = this->Directories.begin();
- di != this->Directories.end(); ++di)
- {
- bool not_optional = false;
- const char* no_properties = 0;
- const char* no_rename = 0;
- this->AddInstallRule(os, this->Destination.c_str(),
- cmTarget::INSTALL_DIRECTORY, di->c_str(),
- not_optional, no_properties,
- this->FilePermissions.c_str(),
- this->DirPermissions.c_str(),
- this->Configurations, this->Component.c_str(),
- no_rename, this->LiteralArguments.c_str());
- }
+ bool not_optional = false;
+ const char* no_properties = 0;
+ const char* no_rename = 0;
+ this->AddInstallRule(os, this->Destination.c_str(),
+ cmTarget::INSTALL_DIRECTORY,
+ this->Directories,
+ not_optional, no_properties,
+ this->FilePermissions.c_str(),
+ this->DirPermissions.c_str(),
+ this->Configurations, this->Component.c_str(),
+ no_rename, this->LiteralArguments.c_str());
}