From 7f29f8966d672a2f8ef50b2249f6d826d1702bdc Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 2 Jul 2007 14:56:57 -0400 Subject: ENH: Further cleanup of installation script generation. The per-component and per-configuration testing is now done in cmake code instead of in the FILE(INSTALL) command. The generation of the cmake code to do these tests is centralized in cmInstallGenerator. Old-style shared library versioning and component/config support code has been removed from FILE(INSTALL). This commit is surrounded by the tags CMake-InstallGeneratorCleanup2-pre and CMake-InstallGeneratorCleanup2-post. --- Source/cmInstallDirectoryGenerator.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/cmInstallDirectoryGenerator.cxx') diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 1a80c467ea..350a4fdd28 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -27,9 +27,8 @@ cmInstallDirectoryGenerator std::vector const& configurations, const char* component, const char* literal_args): - cmInstallGenerator(dest), Directories(dirs), + cmInstallGenerator(dest, configurations, component), Directories(dirs), FilePermissions(file_permissions), DirPermissions(dir_permissions), - Configurations(configurations), Component(component), LiteralArguments(literal_args) { } @@ -41,7 +40,9 @@ cmInstallDirectoryGenerator } //---------------------------------------------------------------------------- -void cmInstallDirectoryGenerator::GenerateScript(std::ostream& os) +void +cmInstallDirectoryGenerator::GenerateScriptActions(std::ostream& os, + Indent const& indent) { // Write code to install the directories. bool not_optional = false; @@ -53,6 +54,6 @@ void cmInstallDirectoryGenerator::GenerateScript(std::ostream& os) not_optional, no_properties, this->FilePermissions.c_str(), this->DirPermissions.c_str(), - this->Configurations, this->Component.c_str(), - no_rename, this->LiteralArguments.c_str()); + no_rename, this->LiteralArguments.c_str(), + indent); } -- cgit v1.2.1