Merge branch 'backport-3.31-ci-xcode-26.4' into backport-4.2-ci-xcode-26.4

.gitlab/os-macos.yml

@@ -5,15 +5,16 @@
 .macos:
     variables:
         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-26.3.app/Contents/Developer"
 
 .macos_arm64:
     extends: .macos
+    variables:
+        DEVELOPER_DIR: "/Applications/Xcode-26.4.app/Contents/Developer"
 
 .macos_x86_64:
     extends: .macos
+    variables:
+        DEVELOPER_DIR: "/Applications/Xcode-26.3.app/Contents/Developer"
 
 ### Build and test
 
@@ -173,7 +174,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-26.3
+        - xcode-26.4
         - nonconcurrent
 
 .macos_arm64_tags_ext:
@@ -181,7 +182,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-26.3
+        - xcode-26.4
         - concurrent
 
 .macos_arm64_tags_package:
@@ -189,7 +190,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-26.3
+        - xcode-26.4
         - nonconcurrent
         - finder
 

CTestCustom.cmake.in

@@ -12,8 +12,8 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   "warning: \\(Long double usage is reported only once for each file"
   "warning: To disable this warning use"
   "could not be inlined"
-  "libcm(curl|expat).*has no symbols"
-  "cm(curl|expat).build/[^ ]*.o has no symbols"
+  "libcm(curl|expat|zstd).*has no symbols"
+  "cm(curl|expat|zstd).build/[^ ]*.o has no symbols"
   "not sorted slower link editing will result"
   "stl_deque.h:479"
   "Utilities.cmzlib."

Tests/RunCMake/CMP0156/CMP0156-NEW-AppleClang-Imported-build-stdout.txt

@@ -1,3 +1,5 @@
-ld: warning: ignoring duplicate libraries: '[^']*liblib1\.a'
+[^
+]*ld: warning: ignoring duplicate libraries: '[^']*liblib1\.a'
 ld: fatal warning\(s\) induced error \(-fatal_warnings\)
-(cc|clang): error: linker command failed with exit code 1 \(use -v to see invocation\)
+[^
+]*(cc|clang): error: linker command failed with exit code 1 \(use -v to see invocation\)

Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt

@@ -1,3 +1,5 @@
-ld: warning: ignoring duplicate libraries: '[^']*liblib1\.a', '[^']*liblib2\.a'
+[^
+]*ld: warning: ignoring duplicate libraries: '[^']*liblib1\.a', '[^']*liblib2\.a'
 ld: fatal warning\(s\) induced error \(-fatal_warnings\)
-(cc|clang): error: linker command failed with exit code 1 \(use -v to see invocation\)
+[^
+]*(cc|clang): error: linker command failed with exit code 1 \(use -v to see invocation\)