ENH: Created new install script generation framework. The INSTALL command creates the generators which are later used by cmLocalGenerator to create the cmake_install.cmake files. A new target installation interface is provided by the INSTALL command which fixes several problems with the INSTALL_TARGETS command. See bug#2691. Bugs 1481 and 1695 are addressed by these changes.

1 files changed, 6 insertions, 7 deletions

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index cdd0adc..fd8de7b 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -28,6 +28,7 @@
 
 class cmFunctionBlocker;
 class cmCommand;
+class cmInstallGenerator;
 class cmLocalGenerator;
 class cmMakeDepend;
 class cmSourceFile;
@@ -672,11 +673,10 @@ public:
   void SetPreOrder(bool p) { this->PreOrder = p; }
   bool GetPreOrder() { return this->PreOrder; }
 
-  /** Add a script file to be invoked during installation.  */
-  void AddInstallScript(const char* script)
-    { m_InstallScripts.push_back(script); }
-  std::vector<std::string> const& GetInstallScripts()
-    { return m_InstallScripts; }
+  void AddInstallGenerator(cmInstallGenerator* g)
+    { m_InstallGenerators.push_back(g); }
+  std::vector<cmInstallGenerator*>& GetInstallGenerators()
+    { return m_InstallGenerators; }
 protected:
   // add link libraries and directories to the target
   void AddGlobalLinkInformation(const char* name, cmTarget& target);
@@ -709,8 +709,7 @@ protected:
   
   cmTarget::LinkLibraries m_LinkLibraries;
 
-  // List of install-time scripts.  This should not be inherited.
-  std::vector<std::string> m_InstallScripts;
+  std::vector<cmInstallGenerator*> m_InstallGenerators;
 
   std::string m_IncludeFileRegularExpression;
   std::string m_ComplainFileRegularExpression;