ENH: Improved implementation of INSTALL_FILES and INSTALL_PROGRAMS commands. Source paths can now be relative or full paths, and don't need to be in the same directory as the CMakeLists.txt file.

1 files changed, 68 insertions, 9 deletions

diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx
index 990bd471a4..d16354a56d 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -30,16 +30,30 @@ bool cmInstallFilesCommand::InitialPass(std::vector<std::string> const& argsIn)
 
   // Create an INSTALL_FILES target specifically for this path.
   m_TargetName = "INSTALL_FILES_"+args[0];
-  cmTarget target;
+  cmTarget& target = m_Makefile->GetTargets()[m_TargetName];
   target.SetInAll(false);
   target.SetType(cmTarget::INSTALL_FILES);
   target.SetInstallPath(args[0].c_str());
-  m_Makefile->GetTargets().insert(cmTargets::value_type(m_TargetName, target));
-
-  std::vector<std::string>::const_iterator s = args.begin();
-  for (++s;s != args.end(); ++s)
+  
+  if((args.size() > 1) && (args[1] == "FILES"))
     {
-    m_FinalArgs.push_back(*s);
+    m_IsFilesForm = true;    
+    for(std::vector<std::string>::const_iterator s = args.begin()+2;
+        s != args.end(); ++s)
+      {
+      // Find the source location for each file listed.
+      std::string f = this->FindInstallSource(s->c_str());
+      target.GetSourceLists().push_back(f);
+      }
+    }
+  else
+    {
+    m_IsFilesForm = false;
+    std::vector<std::string>::const_iterator s = args.begin();
+    for (++s;s != args.end(); ++s)
+      {
+      m_FinalArgs.push_back(*s);
+      }
     }
   
   return true;
@@ -47,6 +61,12 @@ bool cmInstallFilesCommand::InitialPass(std::vector<std::string> const& argsIn)
 
 void cmInstallFilesCommand::FinalPass() 
 {
+  // No final pass for "FILES" form of arguments.
+  if(m_IsFilesForm)
+    {
+    return;
+    }
+  
   std::string testf;
   std::string ext = m_FinalArgs[0];
   std::vector<std::string>& targetSourceLists =
@@ -72,8 +92,9 @@ void cmInstallFilesCommand::FinalPass()
 	{
 	  testf = cmSystemTools::GetFilenameWithoutLastExtension(temps) + ext;
 	}
+      
       // add to the result
-      targetSourceLists.push_back(testf);
+      targetSourceLists.push_back(this->FindInstallSource(testf.c_str()));
       }
     }
   else     // reg exp list
@@ -87,9 +108,47 @@ void cmInstallFilesCommand::FinalPass()
     // for each argument, get the files 
     for (;s != files.end(); ++s)
       {
-      targetSourceLists.push_back(*s);
+      targetSourceLists.push_back(this->FindInstallSource(s->c_str()));
       }
     }
 }
 
-      
+/**
+ * Find a file in the build or source tree for installation given a
+ * relative path from the CMakeLists.txt file.  This will favor files
+ * present in the build tree.  If a full path is given, it is just
+ * returned.
+ */
+std::string cmInstallFilesCommand::FindInstallSource(const char* name) const
+{
+  if(cmSystemTools::FileIsFullPath(name))
+    {
+    // This is a full path.
+    return name;
+    }
+  
+  // This is a relative path.
+  std::string tb = m_Makefile->GetCurrentOutputDirectory();
+  tb += "/";
+  tb += name;
+  std::string ts = m_Makefile->GetCurrentDirectory();
+  ts += "/";
+  ts += name;
+  
+  if(cmSystemTools::FileExists(tb.c_str()))
+    {
+    // The file exists in the binary tree.  Use it.
+    return tb;
+    }
+  else if(cmSystemTools::FileExists(ts.c_str()))
+    {
+    // The file exists in the source tree.  Use it.
+    return ts;
+    }
+  else
+    {
+    // The file doesn't exist.  Assume it will be present in the
+    // binary tree when the install occurs.
+    return tb;
+    }
+}