summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileLibraryTargetGenerator.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileLibraryTargetGenerator.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 17c2fab..36021dc 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -245,12 +245,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
this->LocalGenerator->ConfigurationName.c_str());
// Construct the full path version of the names.
- std::string outpath = this->LocalGenerator->LibraryOutputPath;
- if(outpath.length() == 0)
- {
- outpath = this->Makefile->GetStartOutputDirectory();
- outpath += "/";
- }
+ std::string outpath;
if(relink)
{
outpath = this->Makefile->GetStartOutputDirectory();
@@ -259,6 +254,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
cmSystemTools::MakeDirectory(outpath.c_str());
outpath += "/";
}
+ else
+ {
+ outpath = this->Target->GetOutputDir();
+ outpath += "/";
+ }
std::string targetFullPath = outpath + targetName;
std::string targetFullPathPDB = outpath + targetNamePDB;
std::string targetFullPathSO = outpath + targetNameSO;