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.

1 files changed, 19 insertions, 2 deletions

diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 275eb11..bf9d228 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -52,7 +52,7 @@ void cmInstallGenerator
                  std::ostream& os,
                  const char* dest,
                  int type,
-                 const char* file,
+                 std::vector<std::string> const& files,
                  bool optional /* = false */,
                  const char* properties /* = 0 */,
                  const char* permissions_file /* = 0 */,
@@ -110,7 +110,24 @@ void cmInstallGenerator
     {
     os << " COMPONENTS \"" << component << "\"";
     }
-  os << " FILES \"" << file << "\"";
+  os << " FILES";
+  if(files.size() == 1)
+    {
+    os << " \"" << files[0] << "\"";
+    }
+  else
+    {
+    for(std::vector<std::string>::const_iterator fi = files.begin();
+        fi != files.end(); ++fi)
+      {
+      os << "\n  \"" << *fi << "\"";
+      }
+    os << "\n ";
+    if(!(literal_args && *literal_args))
+      {
+      os << " ";
+      }
+    }
   if(literal_args && *literal_args)
     {
     os << literal_args;