diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-06 15:12:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-09-06 15:12:57 (GMT) |
| commit | ce4df15c41967df41c3061622f48a22b57674bfc (patch) | |
| tree | f034084bb6c4ab9e105818be680cb391e6eb183d /Source | |
| parent | d0cfba9d6e60ad1afe0f9b036358a09b98a5fa9d (diff) | |
| parent | b78a14e204fee7547f6e513a9215f6204f30c159 (diff) | |
| download | CMake-ce4df15c41967df41c3061622f48a22b57674bfc.zip CMake-ce4df15c41967df41c3061622f48a22b57674bfc.tar.gz CMake-ce4df15c41967df41c3061622f48a22b57674bfc.tar.bz2 | |
Merge topic 'xcode-no-legacy-buildsystem'
b78a14e204 Xcode: reject legacy buildsystem for Xcode 14
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8762
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 3b9d2fd..90b8839 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -407,8 +407,10 @@ bool cmGlobalXCodeGenerator::ProcessGeneratorToolsetField( mf->IssueMessage(MessageType::FATAL_ERROR, e); return false; } - if (this->XcodeBuildSystem == BuildSystem::Twelve && - this->XcodeVersion < 120) { + if ((this->XcodeBuildSystem == BuildSystem::Twelve && + this->XcodeVersion < 120) || + (this->XcodeBuildSystem == BuildSystem::One && + this->XcodeVersion >= 140)) { /* clang-format off */ std::string const& e = cmStrCat( "Generator\n" |