diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-07 13:26:30 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-07 09:26:35 -0400 |
| commit | 19cd773c44d645a0a98ea5f58ffb0ce292622ec6 (patch) | |
| tree | 6ecb4d9c56b4b315fec8e7022f360740c5d432be | |
| parent | 13fa9701490a872effc21f13f3e1c65ca30c71e3 (diff) | |
| parent | 71a2664ebb0fd6a8d56eadee058aecc431a40594 (diff) | |
| download | cmake-19cd773c44d645a0a98ea5f58ffb0ce292622ec6.tar.gz | |
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
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 693a11c9a1..77403b076a 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -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: |