Merge topic 'xcode13-old-buildsystem' into release-3.21

71a2664ebb Xcode: Ignore deprecated build system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6309
This commit is contained in:
Brad King
2021-07-07 13:26:30 +00:00
committed by Kitware Robot

View File

@@ -4617,7 +4617,11 @@ void cmGlobalXCodeGenerator::OutputXCodeWorkspaceSettings(
switch (this->XcodeBuildSystem) {
case BuildSystem::One:
xout.Element("string", "Original");
xout.Element("key", "DisableBuildSystemDeprecationWarning");
if (this->XcodeVersion >= 130) {
xout.Element("key", "DisableBuildSystemDeprecationDiagnostic");
} else {
xout.Element("key", "DisableBuildSystemDeprecationWarning");
}
xout.Element("true");
break;
case BuildSystem::Twelve: