From a0b06fe7b2f49f441e872eef266def04e46ba134 Mon Sep 17 00:00:00 2001
From: Fabian Saccilotto <f.saccilotto@gmx.ch>
Date: Fri, 26 Jul 2013 10:30:48 +0200
Subject: [PATCH] Configuration dependent install / export

---
 Source/cmExportFileGenerator.cxx | 15 +++++++++++++++
 Source/cmExportFileGenerator.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 27ec56b..0da25c7 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -714,6 +714,7 @@ void cmExportFileGenerator::GenerateImportHeaderCode(std::ostream& os,
     }
   os << "#----------------------------------------------------------------\n"
      << "\n";
+  this->GenerateImportConfigurationCode(os, config);
   this->GenerateImportVersionCode(os);
 }
 
@@ -735,6 +736,20 @@ void cmExportFileGenerator::GenerateImportVersionCode(std::ostream& os)
 }
 
 //----------------------------------------------------------------------------
+void cmExportFileGenerator::GenerateImportConfigurationCode(std::ostream& os,
+                                                     const char* config)
+{
+  // Store the used configuration, this will allow configuration dependent
+  // paths in multi-configuration environments
+  if(config)
+    {
+    os << "# Set configuration for use in paths.\n"
+       << "set(BUILD_TYPE " << config << ")\n"
+       << "\n";
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
                                             const std::string &expectedTargets)
 {
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 9f958a2..da8b7a8 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -54,6 +54,7 @@ protected:
   void GenerateImportHeaderCode(std::ostream& os, const char* config = 0);
   void GenerateImportFooterCode(std::ostream& os);
   void GenerateImportVersionCode(std::ostream& os);
+  void GenerateImportConfigurationCode(std::ostream& os, const char* config);
   void GenerateImportTargetCode(std::ostream& os, cmTarget* target);
   void GenerateImportPropertyCode(std::ostream& os, const char* config,
                                   cmTarget* target,
-- 
1.8.1.msysgit.1

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index ad17556..284c1d1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -361,6 +361,16 @@ cmExportInstallFileGenerator
 
   // Construct the installed location of the target.
   std::string dest = itgen->GetDestination();
+
+  // parse generator expressions in destination
+  cmListFileBacktrace lfbt;
+  cmGeneratorExpression ge(lfbt);
+  this->ReplaceInstallPrefix(dest);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dest);
+  dest = cge->Evaluate(target->GetMakefile(), config ,
+      false, target);
+
+
   std::string value;
   if(!cmSystemTools::FileIsFullPath(dest.c_str()))
     {
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index d105a0c..b603532 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -30,11 +30,31 @@ cmInstallGenerator
 {
 }
 
+
+//----------------------------------------------------------------------------
+void cmInstallGenerator
+    ::AddInstallRule(
+    std::ostream& os,
+    cmInstallType type,
+    std::vector<std::string> const& files,
+    bool optional /* = false */,
+    const char* permissions_file /* = 0 */,
+    const char* permissions_dir /* = 0 */,
+    const char* rename /* = 0 */,
+    const char* literal_args /* = 0 */,
+    Indent const& indent
+    )
+{
+    std::string dest = this->GetInstallDestination() ;
+    this->AddInstallRule(os,type,dest.c_str(),files,optional,permissions_file,permissions_dir,rename,literal_args,indent) ;
+}
+
 //----------------------------------------------------------------------------
 void cmInstallGenerator
 ::AddInstallRule(
                  std::ostream& os,
                  cmInstallType type,
+                 const char* dest,
                  std::vector<std::string> const& files,
                  bool optional /* = false */,
                  const char* permissions_file /* = 0 */,
@@ -57,8 +77,7 @@ void cmInstallGenerator
     case cmInstallType_FILES:          stype = "FILE"; break;
     }
   os << indent;
-  std::string dest = this->GetInstallDestination();
-  if (cmSystemTools::FileIsFullPath(dest.c_str()))
+  if (cmSystemTools::FileIsFullPath(dest))
      {
      os << "list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES\n";
      os << indent << " \"";
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index c89ab8a..c6e6fc7 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -40,6 +40,18 @@ public:
     Indent const& indent = Indent()
     );
 
+  void AddInstallRule(
+      std::ostream& os, cmInstallType type,
+      const char* dest,
+      std::vector<std::string> const& files,
+      bool optional = false,
+      const char* permissions_file = 0,
+      const char* permissions_dir = 0,
+      const char* rename = 0,
+      const char* literal_args = 0,
+      Indent const& indent = Indent()
+      );
+
   const char* GetDestination() const
     { return this->Destination.c_str(); }
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7b9109e..9f8c23a 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -76,6 +76,15 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     fromDirConfig += "/";
     }
   std::string toDir = this->GetInstallDestination();
+
+  // parse generator expressions in destination
+  cmListFileBacktrace lfbt;
+  cmGeneratorExpression ge(lfbt);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(toDir);
+  toDir = cge->Evaluate(this->Target->GetMakefile(), config ,
+      false, this->Target);
+  
+
   toDir += "/";
 
   // Compute the list of files to install for this target.
@@ -306,7 +315,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   const char* no_dir_permissions = 0;
   const char* no_rename = 0;
   bool optional = this->Optional || this->ImportLibrary;
-  this->AddInstallRule(os, type, filesFrom,
+  this->AddInstallRule(os, type, toDir.c_str(), filesFrom,
                        optional,
                        this->FilePermissions.c_str(), no_dir_permissions,
                        no_rename, literal_args.c_str(),