diff options
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 3111911..349b53b 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2610,25 +2610,16 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) } } - // Link to the pch object file - std::string pchSourceObj = - reuseTarget->GetPchFileObject(config, lang, arch); - - if (target->GetType() != cmStateEnums::OBJECT_LIBRARY) { - std::string linkerProperty = "LINK_FLAGS_"; - if (target->GetType() == cmStateEnums::STATIC_LIBRARY) { - linkerProperty = "STATIC_LIBRARY_FLAGS_"; - } + if (reuseTarget->GetType() != cmStateEnums::OBJECT_LIBRARY) { + std::string pchSourceObj = + reuseTarget->GetPchFileObject(config, lang, arch); + + // Link to the pch object file target->Target->AppendProperty( - cmStrCat(linkerProperty, configUpper), + cmStrCat("LINK_FLAGS_", configUpper), cmStrCat(" ", this->ConvertToOutputFormat(pchSourceObj, SHELL)), true); - } else { - target->Target->AppendProperty( - "INTERFACE_LINK_LIBRARIES", - cmStrCat("$<$<CONFIG:", config, - ">:$<LINK_ONLY:", pchSourceObj, ">>")); } } } else { @@ -2747,7 +2738,7 @@ void cmLocalGenerator::CopyPchCompilePdb( this->AddCustomCommandToTarget( target->GetName(), outputs, no_deps, commandLines, cmCustomCommandType::PRE_BUILD, no_message, no_current_dir, true, false, - "", "", false, cmObjectLibraryCommands::Accept, stdPipesUTF8); + "", "", false, cmObjectLibraryCommands::Reject, stdPipesUTF8); } else { cmImplicitDependsList no_implicit_depends; cmSourceFile* copy_rule = this->AddCustomCommandToOutput( |