Skip to content

Commit

Permalink
Require ROOT 6.30/02 for all platforms for move to C++17.
Browse files Browse the repository at this point in the history
For CI we will provide ROOT 6.30/02 for CentOS7, Ubuntu 20.04,22.04 and
macOS 12,13,14.
  • Loading branch information
FonsRademakers committed Feb 2, 2024
1 parent 600cdb1 commit 560f0d2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cmake/external/ROOT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include(utils)
# Directory in which ROOT will be downloaded
SET(ROOT_SOURCE_DIR "${CMAKE_THIRD_PARTY_DIR}/root")

set(ROOT_TAR_FILE root_v6.22.06_python3.9_${DETECTED_OS_VERS}.tar.gz)
set(ROOT_TAR_FILE root_v6.30.02_python3.9_${DETECTED_OS_VERS}.tar.gz)
set(ROOT_SHA_KEY ${DETECTED_OS_VERS}-ROOT)
if(APPLE)
if("${DETECTED_OS_VERS}" MATCHES "^osx-14" OR
Expand All @@ -19,15 +19,15 @@ if(APPLE)
set(ROOT_SHA_KEY osx-xcode-15.2-${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_TAR_FILE root_v6.30.02_cxx17_python3.9_osx-xcode-14.3-${DETECTED_ARCH}.tar.gz)
set(ROOT_SHA_KEY osx-xcode-14.3-${DETECTED_ARCH}-ROOT)
elseif("${XCODE_VERS}" GREATER_EQUAL "14.1")
message(STATUS "##### Using ROOT builds for XCODE 14.1")
set(ROOT_TAR_FILE root_v6.26.06_cxx14_python3.9_osx-xcode-14.1-${DETECTED_ARCH}.tar.gz)
set(ROOT_TAR_FILE root_v6.30.02_cxx17_python3.9_osx-xcode-14.1-${DETECTED_ARCH}.tar.gz)
set(ROOT_SHA_KEY osx-xcode-14.1-${DETECTED_ARCH}-ROOT)
else()
message(STATUS "##### Using ROOT builds for XCODE 13.1")
set(ROOT_TAR_FILE root_v6.25.01_cxx14_python3.9_osx-xcode-13.1-${DETECTED_ARCH}.tar.gz)
set(ROOT_TAR_FILE root_v6.30.02_cxx17_python3.9_osx-xcode-13.1-${DETECTED_ARCH}.tar.gz)
set(ROOT_SHA_KEY osx-xcode-13.1-${DETECTED_ARCH}-ROOT)
endif()
elseif("${DETECTED_OS_VERS}" MATCHES "^osx-11")
Expand Down

0 comments on commit 560f0d2

Please sign in to comment.