Skip to content

Commit

Permalink
Port to macOS 15.2 with Xcode 16.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
FonsRademakers committed Dec 13, 2024
1 parent 25dc979 commit ab8afa1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
6 changes: 5 additions & 1 deletion cmake/external/ROOT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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 "16.1")
if("${XCODE_VERS}" GREATER_EQUAL "16.2")
message(STATUS "##### Using ROOT builds for XCODE 16.2")
set(ROOT_TAR_FILE root_v6.32.08_cxx17_python3.9_osx-xcode-16.2-${DETECTED_ARCH}.tar.gz)
set(ROOT_SHA_KEY osx-xcode-16.2-${DETECTED_ARCH}-ROOT)
elseif("${XCODE_VERS}" GREATER_EQUAL "16.1")
message(STATUS "##### Using ROOT builds for XCODE 16.1")
set(ROOT_TAR_FILE root_v6.32.06_cxx17_python3.9_osx-xcode-16.1-${DETECTED_ARCH}.tar.gz)
set(ROOT_SHA_KEY osx-xcode-16.1-${DETECTED_ARCH}-ROOT)
Expand Down
4 changes: 4 additions & 0 deletions cmake/external/SHA256Digests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ SET(osx-15.0-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e8055
SET(osx-15.0-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4)
SET(osx-15.1-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb)
SET(osx-15.1-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4)
SET(osx-15.2-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb)
SET(osx-15.2-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4)
SET(osx-xcode-13.1-i386-ROOT be97dd72022c8d082fbe4394f18b55c4920f20b138cfff1b5fc2b41d397ac203)
SET(osx-xcode-13.1-arm64-ROOT 0a55b91c6df42d152b7943912e134f05c3872a73e73fcc129ee87fd847240ec8)
SET(osx-xcode-14.1-i386-ROOT 001311608512b24535bb9710b8baf006bd00e9b0595fd6bdf900d28b1e22c395)
Expand All @@ -88,6 +90,8 @@ SET(osx-xcode-16.0-i386-ROOT cab41b0f2e45990775f8d322713fb9c7904350fdf7f057b4b3c
SET(osx-xcode-16.0-arm64-ROOT f48163b667df74038fd450ffa9dc96637ea535af4b9ff21f4643c121f30bdbfe)
SET(osx-xcode-16.1-i386-ROOT 5d8261b8a694151c802d9de2957e91380b31ddb2fa5c1028ed49afdf6baae6d9)
SET(osx-xcode-16.1-arm64-ROOT b339a8fac8e360087e533a30b4cd1d2a8059ec84d5826a3f9c8c64109fff1c41)
SET(osx-xcode-16.2-i386-ROOT b0be8291d14c0c66f250297e524debc1d6888a95da32e80918fc51c5c582fc8b)
SET(osx-xcode-16.2-arm64-ROOT 4cd66eca15c97b3ffbf159fb7aeb728483c745b275ef89b3679812561cf0e346)

SET(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276)
SET(ubuntu-18.04-ParaView e3fd74b13e9a4086988c5104c6b8d95c56365d25b491706a8e72018d0e5c76f1)
Expand Down

0 comments on commit ab8afa1

Please sign in to comment.