From 44a11c48df4c1c373a165af2b896bea46ac2dc04 Mon Sep 17 00:00:00 2001 From: Tom Eichlersmith <31970302+tomeichlersmith@users.noreply.github.com> Date: Mon, 3 Aug 2026 09:58:59 -0500 Subject: [PATCH 1/3] bump ACTS to 47.2.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 275a93e..938ead0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -410,7 +410,7 @@ RUN install-ubuntu-packages \ ############################################################################### # Acts ############################################################################### -ENV ACTS_VERSION="36.0.0" +ENV ACTS_VERSION="47.2.0" LABEL acts.version=${ACTS_VERSION} RUN mkdir -p src &&\ ${__wget} https://github.com/acts-project/acts/archive/refs/tags/v${ACTS_VERSION}.tar.gz |\ From 9232c6eb2bedaae1ea3a2822ea8ca3c241c1cea4 Mon Sep 17 00:00:00 2001 From: tomeichlersmith Date: Fri, 21 Aug 2026 12:18:21 -0500 Subject: [PATCH 2/3] force old ACTS by removing find_package call in old versions --- ci/interop/v4.3.3.patch | 89 +++++++++++++++++++++++++++++++++++++++- ci/interop/v4.4.14.patch | 2 +- ci/interop/v4.4.7.patch | 2 +- ci/interop/v4.5.11.patch | 12 ++++++ ci/interop/v4.6.5.patch | 12 ++++++ 5 files changed, 114 insertions(+), 3 deletions(-) mode change 120000 => 100644 ci/interop/v4.3.3.patch diff --git a/ci/interop/v4.3.3.patch b/ci/interop/v4.3.3.patch deleted file mode 120000 index 49de7d8..0000000 --- a/ci/interop/v4.3.3.patch +++ /dev/null @@ -1 +0,0 @@ -v4.2.20.patch \ No newline at end of file diff --git a/ci/interop/v4.3.3.patch b/ci/interop/v4.3.3.patch new file mode 100644 index 0000000..5968005 --- /dev/null +++ b/ci/interop/v4.3.3.patch @@ -0,0 +1,88 @@ +diff --git i/DetDescr/CMakeLists.txt w/DetDescr/CMakeLists.txt +index 753eb497..238529bd 100644 +--- i/DetDescr/CMakeLists.txt ++++ w/DetDescr/CMakeLists.txt +@@ -16,32 +16,27 @@ setup_test(dependencies DetDescr::DetDescr) + + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) +- endif() +- +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked +diff --git i/Framework/CMakeLists.txt w/Framework/CMakeLists.txt +index 8627fad6..8bbb2843 100644 +--- i/Framework/CMakeLists.txt ++++ w/Framework/CMakeLists.txt +@@ -23,11 +23,11 @@ setup_library(module Framework name Configure dependencies Python3::Python) + # Search for the Python3 library + find_package(Python3 COMPONENTS Interpreter Development) + ++cmake_policy(SET CMP0167 NEW) + # Search for Boost + find_package( + Boost REQUIRED +- COMPONENTS system +- log ++ COMPONENTS log + filesystem + thread + chrono +diff --git i/Hcal/src/Hcal/HcalClusterProducer.cxx w/Hcal/src/Hcal/HcalClusterProducer.cxx +index 9cf5ef21..c663982f 100644 +--- i/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ w/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "Hcal/MyClusterWeight.h" + #include "Hcal/TemplatedClusterFinder.h" +diff --git i/Tracking/CMakeLists.txt w/Tracking/CMakeLists.txt +index 47671220..ae443194 100644 +--- i/Tracking/CMakeLists.txt ++++ w/Tracking/CMakeLists.txt +@@ -62,7 +62,6 @@ find_package(Eigen3 CONFIG REQUIRED) + # if you want to try an alternate Acts, you can + # 1. comment out the stuff here and replace with add_subdirectory(acts) + # 2. git clone acts into this directory and choose your version +-find_package(Acts QUIET) + if (NOT Acts_FOUND) + message(STATUS "Did not find Acts, downloading and compiling it here") + include(FetchContent) diff --git a/ci/interop/v4.4.14.patch b/ci/interop/v4.4.14.patch index 49de7d8..b61243a 120000 --- a/ci/interop/v4.4.14.patch +++ b/ci/interop/v4.4.14.patch @@ -1 +1 @@ -v4.2.20.patch \ No newline at end of file +v4.3.3.patch \ No newline at end of file diff --git a/ci/interop/v4.4.7.patch b/ci/interop/v4.4.7.patch index 49de7d8..b61243a 120000 --- a/ci/interop/v4.4.7.patch +++ b/ci/interop/v4.4.7.patch @@ -1 +1 @@ -v4.2.20.patch \ No newline at end of file +v4.3.3.patch \ No newline at end of file diff --git a/ci/interop/v4.5.11.patch b/ci/interop/v4.5.11.patch index d230064..a6b1a87 100644 --- a/ci/interop/v4.5.11.patch +++ b/ci/interop/v4.5.11.patch @@ -70,3 +70,15 @@ diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterPr #include "Hcal/MyClusterWeight.h" #include "Hcal/TemplatedClusterFinder.h" +diff --git i/Tracking/CMakeLists.txt w/Tracking/CMakeLists.txt +index 47671220..ae443194 100644 +--- i/Tracking/CMakeLists.txt ++++ w/Tracking/CMakeLists.txt +@@ -62,7 +62,6 @@ find_package(Eigen3 CONFIG REQUIRED) + # if you want to try an alternate Acts, you can + # 1. comment out the stuff here and replace with add_subdirectory(acts) + # 2. git clone acts into this directory and choose your version +-find_package(Acts QUIET) + if (NOT Acts_FOUND) + message(STATUS "Did not find Acts, downloading and compiling it here") + include(FetchContent) diff --git a/ci/interop/v4.6.5.patch b/ci/interop/v4.6.5.patch index 37f3449..e5b32cd 100644 --- a/ci/interop/v4.6.5.patch +++ b/ci/interop/v4.6.5.patch @@ -70,3 +70,15 @@ diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterPr #include "Hcal/MyClusterWeight.h" #include "Recon/TemplatedClusterFinder.h" +diff --git i/Tracking/CMakeLists.txt w/Tracking/CMakeLists.txt +index 47671220..ae443194 100644 +--- i/Tracking/CMakeLists.txt ++++ w/Tracking/CMakeLists.txt +@@ -62,7 +62,6 @@ find_package(Eigen3 CONFIG REQUIRED) + # if you want to try an alternate Acts, you can + # 1. comment out the stuff here and replace with add_subdirectory(acts) + # 2. git clone acts into this directory and choose your version +-find_package(Acts QUIET) + if (NOT Acts_FOUND) + message(STATUS "Did not find Acts, downloading and compiling it here") + include(FetchContent) From 43a6ee0983ed08653255a4ab3fa0e6e7b02debfa Mon Sep 17 00:00:00 2001 From: tomeichlersmith Date: Mon, 24 Aug 2026 10:22:54 -0500 Subject: [PATCH 3/3] include Eigen3 target when building tracking --- ci/interop/v4.2.14.patch | 112 +++++++++++++++++++++++++- ci/interop/v4.2.20.patch | 169 ++++++++++++++++++++++----------------- ci/interop/v4.8.1.patch | 20 +++++ 3 files changed, 227 insertions(+), 74 deletions(-) mode change 120000 => 100644 ci/interop/v4.2.14.patch create mode 100644 ci/interop/v4.8.1.patch diff --git a/ci/interop/v4.2.14.patch b/ci/interop/v4.2.14.patch deleted file mode 120000 index eec60da..0000000 --- a/ci/interop/v4.2.14.patch +++ /dev/null @@ -1 +0,0 @@ -v4.1.4.patch \ No newline at end of file diff --git a/ci/interop/v4.2.14.patch b/ci/interop/v4.2.14.patch new file mode 100644 index 0000000..4fff021 --- /dev/null +++ b/ci/interop/v4.2.14.patch @@ -0,0 +1,111 @@ +diff --git i/Conditions/include/Conditions/SimpleTableCondition.h w/Conditions/include/Conditions/SimpleTableCondition.h +index d34d930d..b69f81c7 100644 +--- i/Conditions/include/Conditions/SimpleTableCondition.h ++++ w/Conditions/include/Conditions/SimpleTableCondition.h +@@ -8,6 +8,7 @@ + + #include + #include ++#include + + #include "Framework/ConditionsObject.h" + #include "Framework/Exception/Exception.h" +diff --git i/DetDescr/CMakeLists.txt w/DetDescr/CMakeLists.txt +index 753eb497..238529bd 100644 +--- i/DetDescr/CMakeLists.txt ++++ w/DetDescr/CMakeLists.txt +@@ -16,32 +16,27 @@ setup_test(dependencies DetDescr::DetDescr) + + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) +- endif() +- +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked +diff --git i/Framework/CMakeLists.txt w/Framework/CMakeLists.txt +index 3da4a2a0..28bf843f 100644 +--- i/Framework/CMakeLists.txt ++++ w/Framework/CMakeLists.txt +@@ -23,11 +23,11 @@ setup_library(module Framework name Configure interface) + # Search for the Python3 library + find_package(Python3 COMPONENTS Interpreter Development) + ++cmake_policy(SET CMP0167 NEW) + # Search for Boost + find_package( + Boost REQUIRED +- COMPONENTS system +- log ++ COMPONENTS log + filesystem + thread + chrono +diff --git i/Hcal/src/Hcal/HcalClusterProducer.cxx w/Hcal/src/Hcal/HcalClusterProducer.cxx +index 7c976f4f..01804ea7 100644 +--- i/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ w/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "Hcal/MyClusterWeight.h" + #include "Hcal/TemplatedClusterFinder.h" +diff --git i/Tracking/CMakeLists.txt w/Tracking/CMakeLists.txt +index 11a45e73..6e7a5d7b 100644 +--- i/Tracking/CMakeLists.txt ++++ w/Tracking/CMakeLists.txt +@@ -75,6 +75,7 @@ setup_library(module Tracking + dependencies Framework::Configure + Framework::Framework + ActsCore ++ Eigen3::Eigen + Geant4::Interface + ROOT::Physics + Tracking::Event +diff --git i/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx w/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx +index 140011d9..0e07b681 100644 +--- i/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx ++++ w/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx +@@ -1,5 +1,6 @@ + #include + ++#include + #include + + #include "TrigScint/Firmware/clusterproducer.h" diff --git a/ci/interop/v4.2.20.patch b/ci/interop/v4.2.20.patch index f84a87a..cd18688 100644 --- a/ci/interop/v4.2.20.patch +++ b/ci/interop/v4.2.20.patch @@ -1,73 +1,96 @@ -diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt ---- a/DetDescr/CMakeLists.txt -+++ b/DetDescr/CMakeLists.txt -@@ -17,32 +17,27 @@ - option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) - if(BUILD_DETECTORID_BINDINGS) -+ cmake_policy(SET CMP0167 NEW) - find_package(Python COMPONENTS Development) - -- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") -- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) -+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") -+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) - # libboost_python3 style libraries - if (NOT Boost_FOUND) -- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") -- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) -+ message("Looking for libboost_python${Python_VERSION_MAJOR}") -+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) - endif() - -- # libboost_python style libraries -- if (NOT Boost_FOUND) -- message("Looking for libboost_python") -- find_package(Boost QUIET COMPONENTS system thread python) -- endif() -- - # libboost_python-py36 style libraries - if (NOT Boost_FOUND) -- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") -- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) -+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") -+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) - endif() - - # libboost_python3-py36 style libraries - if (NOT Boost_FOUND) -- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") -- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) -+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") -+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) - endif() - - # Nothing worked - if (NOT Boost_FOUND) -diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt ---- a/Framework/CMakeLists.txt -+++ b/Framework/CMakeLists.txt -@@ -23,11 +23,11 @@ - # Search for the Python3 library - find_package(Python3 COMPONENTS Interpreter Development) - -+cmake_policy(SET CMP0167 NEW) - # Search for Boost - find_package( - Boost REQUIRED -- COMPONENTS system -- log -+ COMPONENTS log - filesystem - thread - chrono -diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx ---- a/Hcal/src/Hcal/HcalClusterProducer.cxx -+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx -@@ -2,6 +2,7 @@ - - #include - #include -+#include - - #include "Hcal/MyClusterWeight.h" - #include "Hcal/TemplatedClusterFinder.h" +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +index 753eb497..238529bd 100644 +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -16,32 +16,27 @@ setup_test(dependencies DetDescr::DetDescr) +  + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) +  +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) +- endif() +- +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() +  + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() +  + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() +  + # Nothing worked +diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt +index 8627fad6..8bbb2843 100644 +--- a/Framework/CMakeLists.txt ++++ b/Framework/CMakeLists.txt +@@ -23,11 +23,11 @@ setup_library(module Framework name Configure dependencies Python3::Python) + # Search for the Python3 library + find_package(Python3 COMPONENTS Interpreter Development) +  ++cmake_policy(SET CMP0167 NEW) + # Search for Boost + find_package( + Boost REQUIRED +- COMPONENTS system +- log ++ COMPONENTS log + filesystem + thread + chrono +diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx +index 7c976f4f..01804ea7 100644 +--- a/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ b/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ +  + #include  + #include  ++#include  +  + #include "Hcal/MyClusterWeight.h" + #include "Hcal/TemplatedClusterFinder.h" +diff --git a/Tracking/CMakeLists.txt b/Tracking/CMakeLists.txt +index 2f3b4163..24e7d050 100644 +--- a/Tracking/CMakeLists.txt ++++ b/Tracking/CMakeLists.txt +@@ -62,7 +62,6 @@ find_package(Eigen3 CONFIG REQUIRED) + # if you want to try an alternate Acts, you can + # 1. comment out the stuff here and replace with add_subdirectory(acts) + # 2. git clone acts into this directory and choose your version +-find_package(Acts QUIET) + if (NOT Acts_FOUND) + message(STATUS "Did not find Acts, downloading and compiling it here") + include(FetchContent) +@@ -94,6 +93,7 @@ setup_library(module Tracking + dependencies Framework::Configure  + Framework::Framework  + ActsCore ++ Eigen3::Eigen + Geant4::Interface + ROOT::Physics + Tracking::Event diff --git a/ci/interop/v4.8.1.patch b/ci/interop/v4.8.1.patch new file mode 100644 index 0000000..6a33b5a --- /dev/null +++ b/ci/interop/v4.8.1.patch @@ -0,0 +1,20 @@ +diff --git i/Tracking/CMakeLists.txt w/Tracking/CMakeLists.txt +index 6a09400b..54c43f15 100644 +--- i/Tracking/CMakeLists.txt ++++ w/Tracking/CMakeLists.txt +@@ -16,7 +16,6 @@ find_package(Eigen3 CONFIG REQUIRED) + # if you want to try an alternate Acts, you can + # 1. comment out the stuff here and replace with add_subdirectory(acts) + # 2. git clone acts into this directory and choose your version +-find_package(Acts QUIET) + if (NOT Acts_FOUND) + message(STATUS "Did not find Acts, downloading and compiling it here") + include(FetchContent) +@@ -56,6 +55,7 @@ setup_library(module Tracking + dependencies Framework::Configure + Framework::Framework + ActsCore ++ Eigen3::Eigen + Geant4::Interface + ROOT::Physics + Tracking::Event