Skip to content

Commit 63b369d

Browse files
Changes for macOS 15.5 and Xcode 16.4.
1 parent 6aeedd7 commit 63b369d

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

cmake/external/ROOT.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ if(APPLE)
1414
"${DETECTED_OS_VERS}" MATCHES "^osx-11.7")
1515
execute_process(COMMAND bash "-c" "xcodebuild -version | sed -En 's/Xcode[[:space:]]+([0-9\.]*)/\\1/p'" OUTPUT_VARIABLE XCODE_VERS)
1616
message(STATUS "##### XCODE version: ${XCODE_VERS}")
17-
if("${XCODE_VERS}" GREATER_EQUAL "16.3")
17+
if("${XCODE_VERS}" GREATER_EQUAL "16.4")
18+
message(STATUS "##### Using ROOT builds for XCODE 16.4")
19+
set(ROOT_TAR_FILE root_v6.36.00_cxx17_python3.9_osx-xcode-16.4-${DETECTED_ARCH}.tar.gz)
20+
set(ROOT_SHA_KEY osx-xcode-16.4-${DETECTED_ARCH}-ROOT)
21+
elseif("${XCODE_VERS}" GREATER_EQUAL "16.3")
1822
message(STATUS "##### Using ROOT builds for XCODE 16.3")
1923
set(ROOT_TAR_FILE root_v6.34.08_cxx17_python3.9_osx-xcode-16.3-${DETECTED_ARCH}.tar.gz)
2024
set(ROOT_SHA_KEY osx-xcode-16.3-${DETECTED_ARCH}-ROOT)

cmake/external/SHA256Digests.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ SET(osx-15.3-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e8055
7676
SET(osx-15.3-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4)
7777
SET(osx-15.4-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb)
7878
SET(osx-15.4-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4)
79+
SET(osx-15.5-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb)
80+
SET(osx-15.5-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4)
7981
SET(osx-xcode-13.1-i386-ROOT be97dd72022c8d082fbe4394f18b55c4920f20b138cfff1b5fc2b41d397ac203)
8082
SET(osx-xcode-13.1-arm64-ROOT 0a55b91c6df42d152b7943912e134f05c3872a73e73fcc129ee87fd847240ec8)
8183
SET(osx-xcode-14.1-i386-ROOT 001311608512b24535bb9710b8baf006bd00e9b0595fd6bdf900d28b1e22c395)
@@ -97,7 +99,9 @@ SET(osx-xcode-16.1-arm64-ROOT b339a8fac8e360087e533a30b4cd1d2a8059ec84d5826a3f9c
9799
SET(osx-xcode-16.2-i386-ROOT b0be8291d14c0c66f250297e524debc1d6888a95da32e80918fc51c5c582fc8b)
98100
SET(osx-xcode-16.2-arm64-ROOT 4cd66eca15c97b3ffbf159fb7aeb728483c745b275ef89b3679812561cf0e346)
99101
SET(osx-xcode-16.3-i386-ROOT b0be8291d14c0c66f250297e524debc1d6888a95da32e80918fc51c5c582fc8b)
100-
SET(osx-xcode-16.3-arm64-ROOT 6021e4d3b2ef5e75f8cb888f373917162f68385d1475dda135081f8cf5bf54a3)
102+
SET(osx-xcode-16.3-arm64-ROOT b525e0d360eb6c1912ab1cfcbf7fe30bfa8d55c48b80bcae65b62bf403ca0d9c)
103+
SET(osx-xcode-16.4-i386-ROOT b0be8291d14c0c66f250297e524debc1d6888a95da32e80918fc51c5c582fc8b)
104+
SET(osx-xcode-16.4-arm64-ROOT 88810d081e0237e2fe436dc937e783bdf3f1c5d86ed7b3ff766d969dfe6bd0b3)
101105

102106
SET(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276)
103107
SET(ubuntu-18.04-ParaView e3fd74b13e9a4086988c5104c6b8d95c56365d25b491706a8e72018d0e5c76f1)

0 commit comments

Comments
 (0)