summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-02-06 19:19:03 (GMT)
committerBrad King <brad.king@kitware.com>2008-02-06 19:19:03 (GMT)
commitafad12431371d9a725b9a85db39f8c4da37fabaf (patch)
treea642600883fe49d5be4f40b2da71c774ef9d731e /Source/cmTarget.cxx
parent31a6670e43dbeafab44ed3863d6172f68da408bc (diff)
downloadCMake-afad12431371d9a725b9a85db39f8c4da37fabaf.zip
CMake-afad12431371d9a725b9a85db39f8c4da37fabaf.tar.gz
CMake-afad12431371d9a725b9a85db39f8c4da37fabaf.tar.bz2
BUG: Make sure linking to a shared lib on windows uses import library and not the new realname.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6cb8d93..a9c5b53 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2093,13 +2093,17 @@ std::string cmTarget::NormalGetFullPath(const char* config, bool implib,
fpath += "/";
// Add the full name of the target.
- if(realname)
+ if(implib)
+ {
+ fpath += this->GetFullName(config, true);
+ }
+ else if(realname)
{
fpath += this->NormalGetRealName(config);
}
else
{
- fpath += this->GetFullName(config, implib);
+ fpath += this->GetFullName(config, false);
}
return fpath;
}