mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 10:18:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'xcode-no-legacy-buildsystem'

Browse Source 
b78a14e204 Xcode: reject legacy buildsystem for Xcode 14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8762
This commit is contained in:
Brad King
2023-09-06 15:12:49 +00:00
committed by Kitware Robot
parent d0cfba9d6e b78a14e204
commit ce4df15c41
8 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Help/release/dev/xcode-no-legacy-buildsystem.rst Normal file
View File

@@ -0,0 +1,8 @@
xcode-no-legacy-buildsystem
---------------------------
* The :generator:`Xcode` generator will now issue a fatal error if
the Legacy Build System has been selected for Xcode 14 and
newer. Those Xcode versions dropped support for the Legacy Build
System and expect the project being set-up for their current
Build System.

3
Help/variable/CMAKE_XCODE_BUILD_SYSTEM.rst
View File

@@ -12,7 +12,8 @@ mature enough for use by CMake. The possible values are:
``1``
The original Xcode build system.
This is the default when using Xcode 11.x or below.
This is the default when using Xcode 11.x or below and supported
up to Xcode 13.x.
``12``
The Xcode "new build system" introduced by Xcode 10.

6
Source/cmGlobalXCodeGenerator.cxx
View File

@@ -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"

1
Tests/RunCMake/GeneratorToolset/BadToolsetXcodeBuildSystem1-result.txt Normal file
View File

@@ -0,0 +1 @@
1

10
Tests/RunCMake/GeneratorToolset/BadToolsetXcodeBuildSystem1-stderr.txt Normal file
View File

@@ -0,0 +1,10 @@
CMake Error at CMakeLists.txt:[0-9]+ \(project\):
Generator
Xcode
toolset specification field
buildsystem=1
is not allowed with Xcode [0-9.]+\.$

1
Tests/RunCMake/GeneratorToolset/BadToolsetXcodeBuildSystem1.cmake Normal file
View File

@@ -0,0 +1 @@
message(FATAL_ERROR "This should not be reached!")

6
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
View File

@@ -89,7 +89,11 @@ elseif("${RunCMake_GENERATOR}" STREQUAL "Xcode")
set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
run_cmake(TestToolsetXcodeBuildSystemDefault12)
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,buildsystem=1")
run_cmake(TestToolsetXcodeBuildSystem1)
if(XCODE_VERSION VERSION_GREATER_EQUAL 14)
run_cmake(BadToolsetXcodeBuildSystem1)
else()
run_cmake(TestToolsetXcodeBuildSystem1)
endif()
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,buildsystem=12")
run_cmake(TestToolsetXcodeBuildSystem12)
else()

6
Tests/RunCMake/XcodeProject-Device/RunCMakeTest.cmake
View File

@@ -311,9 +311,11 @@ if (XCODE_VERSION VERSION_GREATER_EQUAL 7.3)
endfunction()
if(XCODE_VERSION VERSION_GREATER_EQUAL 12)
xctest_add_bundle_test(Darwin macosx "1" "$<TARGET_BUNDLE_CONTENT_DIR:TestedApp>/PlugIns")
xctest_add_bundle_test(Darwin macosx "12" "$<TARGET_BUNDLE_CONTENT_DIR:TestedApp>/PlugIns")
xctest_add_bundle_test(iOS iphonesimulator "1" "$<TARGET_BUNDLE_CONTENT_DIR:TestedApp>/PlugIns")
if(XCODE_VERSION VERSION_LESS 14)
xctest_add_bundle_test(Darwin macosx "1" "$<TARGET_BUNDLE_CONTENT_DIR:TestedApp>/PlugIns")
xctest_add_bundle_test(iOS iphonesimulator "1" "$<TARGET_BUNDLE_CONTENT_DIR:TestedApp>/PlugIns")
endif()
if (XCODE_VERSION VERSION_LESS 12.5)
xctest_add_bundle_test(iOS iphonesimulator "12" "$<TARGET_BUNDLE_CONTENT_DIR:TestedApp>")
else()