diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-12 00:46:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-12 13:29:29 (GMT) |
| commit | 7f5f0ab4b315488e0e4b7a4bd36a072024ecfed7 (patch) | |
| tree | bfcdd27ca9e75803e270a84e42079a1348ec4d2c /Tests | |
| parent | 9bfb972c25678e517e6995834db11c4aef473a57 (diff) | |
| download | CMake-7f5f0ab4b315488e0e4b7a4bd36a072024ecfed7.zip CMake-7f5f0ab4b315488e0e4b7a4bd36a072024ecfed7.tar.gz CMake-7f5f0ab4b315488e0e4b7a4bd36a072024ecfed7.tar.bz2 | |
Tests: Update RunCMake.CompileFeatures for Xcode 15.3
Xcode no longer puts an extra backslash in its `-std=` flags.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/compiler_introspection.cmake | 7 |
2 files changed, 8 insertions, 1 deletions
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}) |