summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx17
1 files changed, 1 insertions, 16 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 4218930..379ae16 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -504,7 +504,7 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
{
std::string targetFullPathReal;
std::string targetFullPathPDB;
- std::string targetFullPathCompilePDB;
+ std::string targetFullPathCompilePDB = this->ComputeTargetCompilePDB();
if (this->GeneratorTarget->GetType() == cmStateEnums::EXECUTABLE ||
this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY ||
this->GeneratorTarget->GetType() == cmStateEnums::SHARED_LIBRARY ||
@@ -516,21 +516,6 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
targetFullPathPDB += "/";
targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName);
}
- if (this->GeneratorTarget->GetType() <= cmStateEnums::OBJECT_LIBRARY) {
- targetFullPathCompilePDB =
- this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
- if (targetFullPathCompilePDB.empty()) {
- // Match VS default: `$(IntDir)vc$(PlatformToolsetVersion).pdb`.
- // A trailing slash tells the toolchain to add its default file name.
- targetFullPathCompilePDB =
- this->GeneratorTarget->GetSupportDirectory() + "/";
- if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY) {
- // Match VS default for static libs: `$(IntDir)$(ProjectName).pdb`.
- targetFullPathCompilePDB += this->GeneratorTarget->GetName();
- targetFullPathCompilePDB += ".pdb";
- }
- }
- }
targetOutPathReal = this->LocalGenerator->ConvertToOutputFormat(
this->LocalGenerator->MaybeConvertToRelativePath(