Add support for ROOT under Xcode 15.0.x.

BioDynaMo · Nov 28, 2023 · 893ea4e · 893ea4e
1 parent 1f55c00
commit 893ea4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmake/external/ROOT.cmake b/cmake/external/ROOT.cmake
@@ -13,7 +13,11 @@ if(APPLE)
      "${DETECTED_OS_VERS}" MATCHES "^osx-11.7")
     execute_process(COMMAND bash "-c" "xcodebuild -version | sed -En 's/Xcode[[:space:]]+([0-9\.]*)/\\1/p'" OUTPUT_VARIABLE XCODE_VERS)
     message(STATUS "##### XCODE version: ${XCODE_VERS}")
-    if("${XCODE_VERS}" GREATER_EQUAL "14.3")
+    if("${XCODE_VERS}" GREATER_EQUAL "15.0")
+      message(STATUS "##### Using ROOT builds for XCODE 15.0.1")
+      set(ROOT_TAR_FILE root_v6.28.06_cxx14_python3.9_osx-xcode-15.0.1-${DETECTED_ARCH}.tar.gz)
+      set(ROOT_SHA_KEY osx-xcode-15.0.1-${DETECTED_ARCH}-ROOT)
+    elseif("${XCODE_VERS}" GREATER_EQUAL "14.3")
       message(STATUS "##### Using ROOT builds for XCODE 14.3")
       set(ROOT_TAR_FILE root_v6.29.01_cxx14_python3.9_osx-xcode-14.3-${DETECTED_ARCH}.tar.gz)
       set(ROOT_SHA_KEY osx-xcode-14.3-${DETECTED_ARCH}-ROOT)

diff --git a/cmake/external/SHA256Digests.cmake b/cmake/external/SHA256Digests.cmake
@@ -60,6 +60,7 @@ SET(osx-xcode-14.1-i386-ROOT 001311608512b24535bb9710b8baf006bd00e9b0595fd6bdf90
 SET(osx-xcode-14.1-arm64-ROOT 12ad32f7d49e2c5dfd4124923bd87f49a31a670d99e390b0a9b71a8ff2f2f035)
 SET(osx-xcode-14.3-i386-ROOT c4f4c7a9848121ae19f3fe3c40c5812813ed42d9dfa7f1948f67907ed47fa083)
 SET(osx-xcode-14.3-arm64-ROOT 6ffcfaadd4de627cffde2e42fded9175b730769071396d7abdabeefc2714839a)
+SET(osx-xcode-15.0.1-arm64-ROOT 8bcadcaefd817e8adb79b2eff830871f7c838a9e40ec11fd5e4e8a8c7184ffdd)
 
 SET(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276)
 SET(ubuntu-18.04-ParaView e3fd74b13e9a4086988c5104c6b8d95c56365d25b491706a8e72018d0e5c76f1)