diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-12 13:49:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-12 13:49:17 (GMT) |
| commit | 682767e8a5028fe930913d3144d9182797fd4331 (patch) | |
| tree | dc570bb9dcc5637fb25ee4441503de9bd8c24d23 /Tests | |
| parent | e5729862312a53e8ded993bb4098e86063d2131f (diff) | |
| parent | 8a6d05aa9d4ada29610a63050bd294c644de6922 (diff) | |
| download | CMake-682767e8a5028fe930913d3144d9182797fd4331.zip CMake-682767e8a5028fe930913d3144d9182797fd4331.tar.gz CMake-682767e8a5028fe930913d3144d9182797fd4331.tar.bz2 | |
Merge branch 'backport-3.28-ci-xcode-15.3'
Diffstat (limited to 'Tests')
3 files changed, 10 insertions, 3 deletions
diff --git a/Tests/RunCMake/CheckCompilerFlag/CheckCompilerFlagSwift.cmake b/Tests/RunCMake/CheckCompilerFlag/CheckCompilerFlagSwift.cmake index c85783d..97e9b24 100644 --- a/Tests/RunCMake/CheckCompilerFlag/CheckCompilerFlagSwift.cmake +++ b/Tests/RunCMake/CheckCompilerFlag/CheckCompilerFlagSwift.cmake @@ -13,9 +13,9 @@ if(SHOULD_FAIL) message(SEND_ERROR "invalid Swift compile flag didn't fail.") endif() -check_compiler_flag(Swift "-parseable-output" SHOULD_WORK) +check_compiler_flag(Swift "-Onone" SHOULD_WORK) if(NOT SHOULD_WORK) - message(SEND_ERROR "Swift compiler flag '-parseable-output' check failed") + message(SEND_ERROR "Swift compiler flag '-Onone' check failed") endif() # Reset locale diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index 7b72ffe..731a303 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -62,7 +62,7 @@ macro(mangle_flags variable) if(RunCMake_GENERATOR MATCHES "Visual Studio" AND MSVC_TOOLSET_VERSION GREATER_EQUAL 141) string(REPLACE "-" "/" result "${result}") - elseif(RunCMake_GENERATOR STREQUAL "Xcode" AND CMAKE_XCODE_BUILD_SYSTEM GREATER_EQUAL 12) + elseif(RunCMake_GENERATOR STREQUAL "Xcode" AND XCODE_VERSION VERSION_LESS 15.3 AND CMAKE_XCODE_BUILD_SYSTEM GREATER_EQUAL 12) string(REPLACE "=" [[\\=]] result "${result}") endif() diff --git a/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake b/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake index 5691344..f3360c7 100644 --- a/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake +++ b/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake @@ -16,6 +16,13 @@ set(CMAKE_XCODE_BUILD_SYSTEM ${CMAKE_XCODE_BUILD_SYSTEM}) ") endif() +if(XCODE_VERSION) + string(APPEND info " +set(XCODE_VERSION ${XCODE_VERSION}) + +") +endif() + macro(info lang) string(APPEND info "\ set(${lang}_STANDARD_DEFAULT ${CMAKE_${lang}_STANDARD_DEFAULT}) |