From 560f0d2dd68277104f702910ac767cffe177f71b Mon Sep 17 00:00:00 2001 From: Fons Rademakers Date: Fri, 2 Feb 2024 12:44:28 +0100 Subject: [PATCH] Require ROOT 6.30/02 for all platforms for move to C++17. For CI we will provide ROOT 6.30/02 for CentOS7, Ubuntu 20.04,22.04 and macOS 12,13,14. --- cmake/external/ROOT.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/external/ROOT.cmake b/cmake/external/ROOT.cmake index 8fe51a4a9..e206a63f2 100644 --- a/cmake/external/ROOT.cmake +++ b/cmake/external/ROOT.cmake @@ -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 @@ -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")