|
@@ -1441,7 +1441,7 @@ void cmLocalGenerator::GetDeviceLinkFlags(
|
|
|
|
|
|
|
|
auto linklang = linkLineComputer.GetLinkerLanguage(target, config);
|
|
auto linklang = linkLineComputer.GetLinkerLanguage(target, config);
|
|
|
auto ipoEnabled = target->IsIPOEnabled(linklang, config);
|
|
auto ipoEnabled = target->IsIPOEnabled(linklang, config);
|
|
|
- if (!ipoEnabled) {
|
|
|
|
|
|
|
+ if (!ipoEnabled && pcli) {
|
|
|
ipoEnabled = linkLineComputer.ComputeRequiresDeviceLinkingIPOFlag(*pcli);
|
|
ipoEnabled = linkLineComputer.ComputeRequiresDeviceLinkingIPOFlag(*pcli);
|
|
|
}
|
|
}
|
|
|
if (ipoEnabled) {
|
|
if (ipoEnabled) {
|
|
@@ -3001,9 +3001,8 @@ void cmLocalGenerator::CopyPchCompilePdb(
|
|
|
} else {
|
|
} else {
|
|
|
cc->SetOutputs(outputs);
|
|
cc->SetOutputs(outputs);
|
|
|
cmSourceFile* copy_rule = this->AddCustomCommandToOutput(std::move(cc));
|
|
cmSourceFile* copy_rule = this->AddCustomCommandToOutput(std::move(cc));
|
|
|
- copy_rule->SetProperty("CXX_SCAN_FOR_MODULES", "0");
|
|
|
|
|
-
|
|
|
|
|
if (copy_rule) {
|
|
if (copy_rule) {
|
|
|
|
|
+ copy_rule->SetProperty("CXX_SCAN_FOR_MODULES", "0");
|
|
|
target->AddSource(copy_rule->ResolveFullPath());
|
|
target->AddSource(copy_rule->ResolveFullPath());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|