BUG: Fixed optional file install support for multi-configuration generators.

1 files changed, 8 insertions, 1 deletions

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 940939fc0f..243ba632c6 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -16,6 +16,8 @@
 =========================================================================*/
 #include "cmInstallTargetGenerator.h"
 
+#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmTarget.h"
 
@@ -162,8 +164,13 @@ cmInstallTargetGenerator
         this->ConfigurationTypes->begin();
       i != this->ConfigurationTypes->end(); ++i)
     {
+    // Start with the configuration's subdirectory.
+    fname = "";
+    this->Target->GetMakefile()->GetLocalGenerator()->GetGlobalGenerator()->
+      AppendDirectoryForConfig(i->c_str(), fname);
+
     // Set a variable with the target name for this configuration.
-    fname = this->Target->GetFullName(i->c_str(), this->ImportLibrary);
+    fname += this->Target->GetFullName(i->c_str(), this->ImportLibrary);
     os << "SET(" << this->Target->GetName()
        << (this->ImportLibrary? "_IMPNAME_" : "_NAME_") << *i
        << " \"" << fname << "\")\n";