mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-13 18:08:40 -05:00
Merge topic 'var-check-before-usage' into release-4.1
d614e8fb3f cmLocalGenerator: check variables before usage
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11127
This commit is contained in:
@@ -1441,7 +1441,7 @@ void cmLocalGenerator::GetDeviceLinkFlags(
|
||||
|
||||
auto linklang = linkLineComputer.GetLinkerLanguage(target, config);
|
||||
auto ipoEnabled = target->IsIPOEnabled(linklang, config);
|
||||
if (!ipoEnabled) {
|
||||
if (!ipoEnabled && pcli) {
|
||||
ipoEnabled = linkLineComputer.ComputeRequiresDeviceLinkingIPOFlag(*pcli);
|
||||
}
|
||||
if (ipoEnabled) {
|
||||
@@ -3001,9 +3001,8 @@ void cmLocalGenerator::CopyPchCompilePdb(
|
||||
} else {
|
||||
cc->SetOutputs(outputs);
|
||||
cmSourceFile* copy_rule = this->AddCustomCommandToOutput(std::move(cc));
|
||||
copy_rule->SetProperty("CXX_SCAN_FOR_MODULES", "0");
|
||||
|
||||
if (copy_rule) {
|
||||
copy_rule->SetProperty("CXX_SCAN_FOR_MODULES", "0");
|
||||
target->AddSource(copy_rule->ResolveFullPath());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user