diff options
| -rw-r--r-- | .gitlab/os-macos.yml | 12 | ||||
| -rw-r--r-- | Tests/RunCMake/CheckCompilerFlag/CheckCompilerFlagSwift.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/compiler_introspection.cmake | 7 |
4 files changed, 16 insertions, 9 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 81e9ce2..23c68d5 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -7,7 +7,7 @@ GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID" # TODO: Factor this out so that each job selects the Xcode version to # use so that different versions can be tested in a single pipeline. - DEVELOPER_DIR: "/Applications/Xcode-15.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-15.3.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -135,7 +135,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.2 + - xcode-15.3 - nonconcurrent .macos_x86_64_tags_ext: @@ -143,7 +143,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.2 + - xcode-15.3 - concurrent .macos_arm64_tags: @@ -151,7 +151,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.2 + - xcode-15.3 - nonconcurrent .macos_arm64_tags_ext: @@ -159,7 +159,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.2 + - xcode-15.3 - concurrent .macos_arm64_tags_package: @@ -167,7 +167,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.2 + - xcode-15.3 - nonconcurrent - finder 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}) |