BUG: Fix config test for target install rules

In single-configuration generators a target installation rule should
apply to all configurations for which the INSTALL command was specified.
The configuration in which the target is built does not matter.

In multi-configuration generators each installation rule must be
associated with a particular build configuration to install the proper
file.  The set of configurations for which rules are generated is the
intersection of the build configurations and those for which the INSTALL
command was specified.

1 files changed, 3 insertions, 5 deletions

diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index cd4d6e5..0f587e6 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -66,14 +66,11 @@ public:
 protected:
   typedef cmInstallGeneratorIndent Indent;
   virtual void GenerateScript(std::ostream& os);
+  virtual void GenerateScriptConfigs(std::ostream& os, Indent const& indent);
+  virtual void GenerateScriptActions(std::ostream& os, Indent const& indent);
   void GenerateScriptForConfig(std::ostream& os,
-                               const char* fromDir,
                                const char* config,
                                Indent const& indent);
-  void GenerateScriptForConfigDir(std::ostream& os,
-                                  const char* fromDirConfig,
-                                  const char* config,
-                                  Indent const& indent);
   void AddInstallNamePatchRule(std::ostream& os, Indent const& indent,
                                const char* config,
                                const std::string& toDestDirPath);
@@ -96,6 +93,7 @@ protected:
   std::string FilePermissions;
   bool Optional;
   NamelinkModeType NamelinkMode;
+  std::string FromDir;
 };
 
 #endif