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.

1 files changed, 19 insertions, 12 deletions

diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 50d1e3b852..495da6cd78 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -23,13 +23,14 @@
 
 #include "cmInstallExportGenerator.h"
 
-cmInstallExportGenerator::cmInstallExportGenerator(const char* destination,
-    const char* file_permissions,
-    std::vector<std::string> const& configurations,
-    const char* filename, const char* prefix, const char* tempOutputDir)
-  :cmInstallGenerator(destination)
+cmInstallExportGenerator::cmInstallExportGenerator(
+  const char* destination,
+  const char* file_permissions,
+  std::vector<std::string> const& configurations,
+  const char* component,
+  const char* filename, const char* prefix, const char* tempOutputDir)
+  :cmInstallGenerator(destination, configurations, component)
   ,FilePermissions(file_permissions)
-  ,Configurations(configurations)
   ,Filename(filename)
   ,Prefix(prefix)
   ,TempOutputDir(tempOutputDir)
@@ -221,13 +222,19 @@ void cmInstallExportGenerator::GenerateScript(std::ostream& os)
       exportFileStream << "                      )\n\n";
     }
 
+  // Perform the main install script generation.
+  this->cmInstallGenerator::GenerateScript(os);
+}
+
+//----------------------------------------------------------------------------
+void cmInstallExportGenerator::GenerateScriptActions(std::ostream& os,
+                                                     Indent const& indent)
+{
   // install rule for the file created above
   std::vector<std::string> exportFile;
   exportFile.push_back(this->ExportFilename);
-  this->AddInstallRule(os, this->Destination.c_str(), cmTarget::INSTALL_FILES, 
-                       exportFile, false, 0, 
-                       this->FilePermissions.c_str(), 0, this->Configurations, 
-                       0, this->Filename.c_str(), 0);
-
+  this->AddInstallRule(os, this->Destination.c_str(), cmTarget::INSTALL_FILES,
+                       exportFile, false, 0,
+                       this->FilePermissions.c_str(),
+                       0, this->Filename.c_str(), 0, indent);
 }
-