From b194976434427d7e1c6a097a369f20a112fb1d08 Mon Sep 17 00:00:00 2001 From: Isaac Morales Santana <102816007+imorlxs@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:02:05 +0200 Subject: [PATCH 1/4] Fix deprecated Cmake call `FetchContent_Populate` (#387) See deprecation warning documented in #386. --- cmake/utils.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cmake/utils.cmake b/cmake/utils.cmake index d7fc23074..4002ef87d 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -549,12 +549,9 @@ Unset the environment variable BDM_LOCAL_LFS to download the file.") DOWNLOAD_DIR ${DEST_PARENT} SOURCE_DIR ${DEST} ) - - FetchContent_GetProperties(${TAR_FILENAME}) - if (NOT ${TAR_FILENAME}_POPULATED) - FetchContent_Populate(${TAR_FILENAME}) - endif() - + + FetchContent_MakeAvailable(${TAR_FILENAME}) + # Remove subbuild files, we don't need them file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/) endif() From e09510c6d2866bb7aa0c3b27d6e31f076c42ce9c Mon Sep 17 00:00:00 2001 From: Fons Rademakers Date: Wed, 18 Sep 2024 17:29:30 +0200 Subject: [PATCH 2/4] Add ROOT supporting new Xcode 16.0 on macOS 15.0 and 14.7. --- cmake/external/ROOT.cmake | 9 +++++++-- cmake/external/SHA256Digests.cmake | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cmake/external/ROOT.cmake b/cmake/external/ROOT.cmake index f4cc74a65..53df07fc5 100644 --- a/cmake/external/ROOT.cmake +++ b/cmake/external/ROOT.cmake @@ -6,14 +6,19 @@ SET(ROOT_SOURCE_DIR "${CMAKE_THIRD_PARTY_DIR}/root") set(ROOT_TAR_FILE root_v6.30.02_cxx17_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 + if("${DETECTED_OS_VERS}" MATCHES "^osx-15" OR + "${DETECTED_OS_VERS}" MATCHES "^osx-14" OR "${DETECTED_OS_VERS}" MATCHES "^osx-13" OR "${DETECTED_OS_VERS}" MATCHES "^osx-12" OR "${DETECTED_OS_VERS}" MATCHES "^osx-11.6" OR "${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 "15.4") + if("${XCODE_VERS}" GREATER_EQUAL "16.0") + message(STATUS "##### Using ROOT builds for XCODE 16.0") + set(ROOT_TAR_FILE root_v6.33.01_cxx17_python3.9_osx-xcode-16.0-${DETECTED_ARCH}.tar.gz) + set(ROOT_SHA_KEY osx-xcode-16.0-${DETECTED_ARCH}-ROOT) + elseif("${XCODE_VERS}" GREATER_EQUAL "15.4") message(STATUS "##### Using ROOT builds for XCODE 15.4") set(ROOT_TAR_FILE root_v6.30.06_cxx17_python3.9_osx-xcode-15.4-${DETECTED_ARCH}.tar.gz) set(ROOT_SHA_KEY osx-xcode-15.4-${DETECTED_ARCH}-ROOT) diff --git a/cmake/external/SHA256Digests.cmake b/cmake/external/SHA256Digests.cmake index 7d863ea96..2645e6a1b 100644 --- a/cmake/external/SHA256Digests.cmake +++ b/cmake/external/SHA256Digests.cmake @@ -64,6 +64,10 @@ SET(osx-14.5-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e8055 SET(osx-14.5-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) SET(osx-14.6-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) SET(osx-14.6-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-14.7-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-14.7-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-15.0-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-15.0-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) @@ -78,6 +82,8 @@ SET(osx-xcode-15.3-i386-ROOT 52cef545acf679c3e491c9ef14e18edee454c90309b7fcf5f36 SET(osx-xcode-15.3-arm64-ROOT 3ee0885c329fab9a965c278cc491db82dcbde3999a96ac80d6f5145fb6794d1e) SET(osx-xcode-15.4-i386-ROOT 360983914520c4c9f1d3dd03c5ccdc251b9f6835cf1bcd4b5e83e2748e04811a) SET(osx-xcode-15.4-arm64-ROOT c50d3664b2eee3ed255ca3ae23f350aac0513bd740884b1133e0efb177bf1928) +SET(osx-xcode-16.0-i386-ROOT 360983914520c4c9f1d3dd03c5ccdc251b9f6835cf1bcd4b5e83e2748e04811a) +SET(osx-xcode-16.0-arm64-ROOT f48163b667df74038fd450ffa9dc96637ea535af4b9ff21f4643c121f30bdbfe) SET(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276) SET(ubuntu-18.04-ParaView e3fd74b13e9a4086988c5104c6b8d95c56365d25b491706a8e72018d0e5c76f1) From a4ff39341f06f901064dafde1ddf6b4d80fb8ecf Mon Sep 17 00:00:00 2001 From: Fons Rademakers Date: Wed, 18 Sep 2024 19:17:59 +0200 Subject: [PATCH 3/4] Update sha256 for ROOT for i386 for Xcode 16.0 on macOS 14.7 and 15.0. --- cmake/external/SHA256Digests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/external/SHA256Digests.cmake b/cmake/external/SHA256Digests.cmake index 2645e6a1b..a5875a37d 100644 --- a/cmake/external/SHA256Digests.cmake +++ b/cmake/external/SHA256Digests.cmake @@ -82,7 +82,7 @@ SET(osx-xcode-15.3-i386-ROOT 52cef545acf679c3e491c9ef14e18edee454c90309b7fcf5f36 SET(osx-xcode-15.3-arm64-ROOT 3ee0885c329fab9a965c278cc491db82dcbde3999a96ac80d6f5145fb6794d1e) SET(osx-xcode-15.4-i386-ROOT 360983914520c4c9f1d3dd03c5ccdc251b9f6835cf1bcd4b5e83e2748e04811a) SET(osx-xcode-15.4-arm64-ROOT c50d3664b2eee3ed255ca3ae23f350aac0513bd740884b1133e0efb177bf1928) -SET(osx-xcode-16.0-i386-ROOT 360983914520c4c9f1d3dd03c5ccdc251b9f6835cf1bcd4b5e83e2748e04811a) +SET(osx-xcode-16.0-i386-ROOT cab41b0f2e45990775f8d322713fb9c7904350fdf7f057b4b3cd6e73ad654bf1) SET(osx-xcode-16.0-arm64-ROOT f48163b667df74038fd450ffa9dc96637ea535af4b9ff21f4643c121f30bdbfe) SET(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276) From 25dc979062d7b4367537c821e80b95e5727f668a Mon Sep 17 00:00:00 2001 From: Fons Rademakers Date: Thu, 31 Oct 2024 10:55:35 +0100 Subject: [PATCH 4/4] Add support for Xcode 16.1 and ROOT v6.32.06. --- cmake/external/ROOT.cmake | 6 +++++- cmake/external/SHA256Digests.cmake | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmake/external/ROOT.cmake b/cmake/external/ROOT.cmake index 53df07fc5..5c95eb9a5 100644 --- a/cmake/external/ROOT.cmake +++ b/cmake/external/ROOT.cmake @@ -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.0") + if("${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) + elseif("${XCODE_VERS}" GREATER_EQUAL "16.0") message(STATUS "##### Using ROOT builds for XCODE 16.0") set(ROOT_TAR_FILE root_v6.33.01_cxx17_python3.9_osx-xcode-16.0-${DETECTED_ARCH}.tar.gz) set(ROOT_SHA_KEY osx-xcode-16.0-${DETECTED_ARCH}-ROOT) diff --git a/cmake/external/SHA256Digests.cmake b/cmake/external/SHA256Digests.cmake index a5875a37d..5b30a7ad4 100644 --- a/cmake/external/SHA256Digests.cmake +++ b/cmake/external/SHA256Digests.cmake @@ -68,6 +68,8 @@ SET(osx-14.7-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e8055 SET(osx-14.7-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) SET(osx-15.0-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) SET(osx-15.0-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-15.1-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-15.1-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) @@ -84,6 +86,8 @@ SET(osx-xcode-15.4-i386-ROOT 360983914520c4c9f1d3dd03c5ccdc251b9f6835cf1bcd4b5e8 SET(osx-xcode-15.4-arm64-ROOT c50d3664b2eee3ed255ca3ae23f350aac0513bd740884b1133e0efb177bf1928) SET(osx-xcode-16.0-i386-ROOT cab41b0f2e45990775f8d322713fb9c7904350fdf7f057b4b3cd6e73ad654bf1) 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(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276) SET(ubuntu-18.04-ParaView e3fd74b13e9a4086988c5104c6b8d95c56365d25b491706a8e72018d0e5c76f1)