Adjust how the SDKROOT it set to not need updates each version

Author: tgoyne

CHANGELOG.md

@@ -9,6 +9,7 @@
 * <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)
 * Valgrind could report a branch on an uninitialized read when opening something that is not an encrypted Realm file as an encrypted Realm file ([PR #7789](https://github.com/realm/realm-core/pull/7789), since v14.10.0).
 * Opening an FLX realm asynchronously may not wait to download all data ([#7720](https://github.com/realm/realm-core/issues/7720), since FLX sync was introduced).
+* Fix compilation with Xcode 16 ([PR #7802](https://github.com/realm/realm-core/pull/7802))
 
 ### Breaking changes
 * None.

evergreen/config.yml

@@ -1674,7 +1674,6 @@ buildvariants:
   expansions:
     cmake_bindir: "/opt/homebrew/bin"
     cmake_toolchain_file: "./tools/cmake/xcode.toolchain.cmake"
-    extra_flags: "-DCMAKE_XCODE_ATTRIBUTE_SDKROOT=iphoneos"
     cmake_build_tool_options: "-sdk iphonesimulator -arch arm64"
     cmake_generator: Xcode
     max_jobs: $(sysctl -n hw.logicalcpu)
@@ -1707,12 +1706,11 @@ buildvariants:
   expansions:
     cmake_url: "https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-macos-universal.tar.gz"
     cmake_bindir: "./cmake_binaries/CMake.app/Contents/bin"
-    cmake_toolchain_file: "./tools/cmake/xcode.toolchain.cmake"
     cmake_generator: Xcode
     max_jobs: $(sysctl -n hw.logicalcpu)
     cmake_build_type: Release
     xcode_developer_dir: /Applications/Xcode13.1.app/Contents/Developer
-    extra_flags: -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=x86_64
+    extra_flags: -DREALM_ENABLE_ASSERTIONS=ON
   tasks:
   - name: benchmarks
   - name: compile_test
@@ -1724,12 +1722,11 @@ buildvariants:
   expansions:
     cmake_url: "https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-macos-universal.tar.gz"
     cmake_bindir: "./cmake_binaries/CMake.app/Contents/bin"
-    cmake_toolchain_file: "./tools/cmake/xcode.toolchain.cmake"
     cmake_generator: Xcode
     max_jobs: $(sysctl -n hw.logicalcpu)
     cmake_build_type: Release
     xcode_developer_dir: /Applications/Xcode13.1.app/Contents/Developer
-    extra_flags: -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=arm64
+    extra_flags: -DREALM_ENABLE_ASSERTIONS=ON
   tasks:
   - name: benchmarks
 

tools/cmake/xcode.toolchain.cmake

@@ -15,19 +15,11 @@ set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator;-appletvos;-appl
 set(CMAKE_XCODE_ATTRIBUTE_SUPPORTS_MACCATALYST "YES")
 set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2,3,4,7")
 
-# With Xcode 14+ the base SDK *mostly* doesn't matter any more, as it
-# officially supports multi-platform builds from a single target.
-# However, as of Xcode 15 beta 8 xcodebuild (but not Xcode itself) requires the
-# visionOS SDK to build for visionOS. 15.0 final doesn't include the visionOS
-# SDK, so the SDKROOT is explicitly set by the invoker when building with the
-# beta Xcode rather than here.
-# Xcode 13 requires using the correct SDK. We no longer support Xcode 13, but
-# still use it on evergreen to build the macOS tests (and nothing else).
+# As of Xcode 14 the iphoneos SDK supports building for all platforms to
+# support multi-platform builds. However, we still have some Xcode 13 builds (for
+# benchmarks) that need to set the SDKROOT to macosx.
 if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_SDKROOT)
-    set(CMAKE_XCODE_ATTRIBUTE_SDKROOT_1500 "iphoneos")
-    set(CMAKE_XCODE_ATTRIBUTE_SDKROOT_1400 "iphoneos")
-    set(CMAKE_XCODE_ATTRIBUTE_SDKROOT_1300 "macosx")
-    set(CMAKE_XCODE_ATTRIBUTE_SDKROOT "$(SDKROOT_$(XCODE_VERSION_MAJOR))")
+    set(CMAKE_XCODE_ATTRIBUTE_SDKROOT "iphoneos")
 endif()
 
 set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "12.0")