From 6291edb63b19d1ef85c2f34455e899046d12b931 Mon Sep 17 00:00:00 2001 From: Andreas Salzburger Date: Fri, 20 Sep 2024 12:15:04 +0200 Subject: [PATCH] chore: synchronize versions (#3631) This PR synchronises the versions between `_acts__version` and the `cmake/ActsExternalSources.cmake` file, they have diverged at many places. --- CMakeLists.txt | 10 +++++----- cmake/ActsExternSources.cmake | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f13ea348110..2444a405ab6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,8 +221,7 @@ endif() # minimal dependency versions. they are defined here in a single place so # they can be easily upgraded, although they might not be used if the # dependency is included via `add_subdirectory(...)`. -set(_acts_actsvg_version 0.4.40) -set(_acts_autodiff_version 0.6) +set(_acts_actsvg_version 0.4.47) set(_acts_boost_version 1.71.0) set(_acts_dd4hep_version 1.21) set(_acts_edm4hep_version 0.7) @@ -232,13 +231,14 @@ set(_acts_podio_version 1.0.1) # will try this first set(_acts_podio_fallback_version 0.16) # if not found, will try this one set(_acts_doxygen_version 1.9.4) set(_acts_hepmc3_version 3.2.1) -set(_acts_nlohmanjson_version 3.2.0) +set(_acts_nlohmanjson_version 3.10.5) set(_acts_onnxruntime_version 1.12.0) set(_acts_root_version 6.20) set(_acts_tbb_version 2020.1) set(_acts_pythia8_version 8.309) -set(_acts_detray_version 0.72.0) -set(_acts_traccc_version 0.13.0) +set(_acts_pybind11_version 2.13.1) +set(_acts_detray_version 0.72.1) +set(_acts_traccc_version 0.15.0) set(_acts_covfie_version 0.10.0) set(_acts_vecmem_version 1.4.0) set(_acts_algebraplugins_version 0.22.0) diff --git a/cmake/ActsExternSources.cmake b/cmake/ActsExternSources.cmake index 2a0cb12d33c..c5b332e7316 100644 --- a/cmake/ActsExternSources.cmake +++ b/cmake/ActsExternSources.cmake @@ -1,40 +1,40 @@ set(ACTS_ACTSVG_SOURCE - "URL;https://github.com/acts-project/actsvg/archive/refs/tags/v0.4.47.tar.gz;URL_HASH;SHA256=aeb3927f8db1c7c9b8afa76adaa720013aa03a01032c8d5f457f623e2b04a172" + "URL;https://github.com/acts-project/actsvg/archive/refs/tags/v${_acts_actsvg_version}.tar.gz;URL_HASH;SHA256=aeb3927f8db1c7c9b8afa76adaa720013aa03a01032c8d5f457f623e2b04a172" CACHE STRING "Source to take ACTSVG from" ) mark_as_advanced(ACTS_ACTSVG_SOURCE) set(ACTS_VECMEM_SOURCE - "URL;https://github.com/acts-project/vecmem/archive/refs/tags/v1.4.0.tar.gz;URL_HASH;SHA256=545dfb4de4f9f3d773eef6a0e3297ebf981bb81950930d0991ad739e31ab16af" + "URL;https://github.com/acts-project/vecmem/archive/refs/tags/v${_acts_vecmem_version}.tar.gz;URL_HASH;SHA256=545dfb4de4f9f3d773eef6a0e3297ebf981bb81950930d0991ad739e31ab16af" CACHE STRING "Source to take VECMEM from" ) mark_as_advanced(ACTS_VECMEM_SOURCE) set(ACTS_ALGEBRAPLUGINS_SOURCE - "URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v0.22.0.tar.gz;URL_HASH;SHA256=6fde02181c1b856c0a17a1925f0969798eecd5e3d6f2a87ea2eb365b6c948cc1" + "URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v${_acts_algebraplugins_version}.tar.gz;URL_HASH;SHA256=6fde02181c1b856c0a17a1925f0969798eecd5e3d6f2a87ea2eb365b6c948cc1" CACHE STRING "Source to take ALGEBRAPLUGINS from" ) mark_as_advanced(ACTS_ALGEBRAPLUGINS_SOURCE) set(ACTS_COVFIE_SOURCE - "URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.10.0.tar.gz;URL_HASH;SHA256=d44142b302ffc193ad2229f1d2cc6d8d720dd9da8c37989ada4f23018f86c964" + "URL;https://github.com/acts-project/covfie/archive/refs/tags/v${_acts_covfie_version}.tar.gz;URL_HASH;SHA256=d44142b302ffc193ad2229f1d2cc6d8d720dd9da8c37989ada4f23018f86c964" CACHE STRING "Source to take COVFIE from" ) mark_as_advanced(ACTS_COVFIE_SOURCE) set(ACTS_DETRAY_SOURCE - "URL;https://github.com/acts-project/detray/archive/refs/tags/v0.72.1.tar.gz;URL_HASH;SHA256=6cc8d34bc0d801338e9ab142c4a9884d19d9c02555dbb56972fab86b98d0f75b" + "URL;https://github.com/acts-project/detray/archive/refs/tags/v${_acts_detray_version}.tar.gz;URL_HASH;SHA256=6cc8d34bc0d801338e9ab142c4a9884d19d9c02555dbb56972fab86b98d0f75b" CACHE STRING "Source to take DETRAY from" ) mark_as_advanced(ACTS_DETRAY_SOURCE) set(ACTS_TRACCC_SOURCE - "URL;https://github.com/acts-project/traccc/archive/refs/tags/v0.15.0.tar.gz;URL_HASH;SHA256=1a9a1d0d2f6c4a7773eae3119b1e044fb52031ca49dfc88e6dc4ab8a11df167e" + "URL;https://github.com/acts-project/traccc/archive/refs/tags/v${_acts_traccc_version}.tar.gz;URL_HASH;SHA256=1a9a1d0d2f6c4a7773eae3119b1e044fb52031ca49dfc88e6dc4ab8a11df167e" CACHE STRING "Source to take TRACCC from" ) @@ -48,7 +48,7 @@ set(ACTS_FRNN_SOURCE mark_as_advanced(ACTS_FRNN_SOURCE) set(ACTS_NLOHMANNJSON_SOURCE - "URL;https://github.com/nlohmann/json/archive/refs/tags/v3.10.5.tar.gz;URL_HASH;SHA256=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4" + "URL;https://github.com/nlohmann/json/archive/refs/tags/v${_acts_nlohmanjson_version}.tar.gz;URL_HASH;SHA256=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4" CACHE STRING "Source to take nlohmann_json from" ) @@ -62,7 +62,7 @@ set(ACTS_EIGEN3_SOURCE mark_as_advanced(ACTS_EIGEN3_SOURCE) set(ACTS_PYBIND11_SOURCE - "GIT_REPOSITORY;https://github.com/pybind/pybind11.git;GIT_TAG;v2.13.1" + "GIT_REPOSITORY;https://github.com/pybind/pybind11.git;GIT_TAG;v${_acts_pybind11_version}" CACHE STRING "Source to take pybind11 from" )