summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-07-07 13:26:30 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-07-07 13:26:35 (GMT)
commit85ea0a9112443e8aad12dfc40881682c890e1937 (patch)
tree49e4ee2ea6512053d4837e3e8a36a4891d88ba19 /Source/cmGlobalXCodeGenerator.cxx
parent0f1efb58c8ac1b6f38f384d33903159ccf7b6608 (diff)
parent71a2664ebb0fd6a8d56eadee058aecc431a40594 (diff)
downloadCMake-85ea0a9112443e8aad12dfc40881682c890e1937.zip
CMake-85ea0a9112443e8aad12dfc40881682c890e1937.tar.gz
CMake-85ea0a9112443e8aad12dfc40881682c890e1937.tar.bz2
Merge topic 'xcode13-old-buildsystem'
71a2664ebb Xcode: Ignore deprecated build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6309
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index f513942..3994816 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -4610,7 +4610,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: