Merge topic 'backport-3.28-ci-xcode-15.3' into release-3.28
8a6d05aa9d
gitlab-ci: update macOS jobs to use Xcode 15.37bf893bc30
Tests: Update RunCMake.CheckCompilerFlag for Xcode 15.37f5f0ab4b3
Tests: Update RunCMake.CompileFeatures for Xcode 15.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9333
This commit is contained in:
commit
7a9fc8ca06
@ -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
|
||||
|
||||
|
@ -12,9 +12,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
|
||||
|
@ -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()
|
||||
|
||||
|
@ -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})
|
||||
|
Loading…
Reference in New Issue
Block a user