diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-20 00:29:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-20 00:29:30 (GMT) |
| commit | 3ca9ef09b72612bd48438701c03ebadc1295441e (patch) | |
| tree | ca05f85f942668a1f3bce0cabd2164e1827faeb6 /Source/cmInstallTargetGenerator.cxx | |
| parent | c21287552bd262a60c38e495b75c91888882e681 (diff) | |
| download | CMake-3ca9ef09b72612bd48438701c03ebadc1295441e.zip CMake-3ca9ef09b72612bd48438701c03ebadc1295441e.tar.gz CMake-3ca9ef09b72612bd48438701c03ebadc1295441e.tar.bz2 | |
BUG: Fixed optional file install support for multi-configuration generators.
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 940939f..243ba63 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"; |