-
Notifications
You must be signed in to change notification settings - Fork 2
bump ACTS to 47.2.0 #198
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
bump ACTS to 47.2.0 #198
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
44a11c4
bump ACTS to 47.2.0
tomeichlersmith 9232c6e
force old ACTS by removing find_package call in old versions
tomeichlersmith 43a6ee0
include Eigen3 target when building tracking
tomeichlersmith 71e2ebd
remove ansi escape sequences
tomeichlersmith b832c00
never use color in git diff to save patch
tomeichlersmith File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <ostream> | ||
| #include <vector> | ||
| +#include <cstdint> | ||
|
|
||
| #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 <exception> | ||
| #include <iostream> | ||
| +#include <list> | ||
|
|
||
| #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 <stdio.h> | ||
|
|
||
| +#include <array> | ||
| #include <iostream> | ||
|
|
||
| #include "TrigScint/Firmware/clusterproducer.h" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <exception> | ||
| #include <iostream> | ||
| +#include <list> | ||
|
|
||
| #include "Hcal/MyClusterWeight.h" | ||
| #include "Hcal/TemplatedClusterFinder.h" | ||
| [1mdiff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt[m | ||
| [1mindex 753eb497..238529bd 100644[m | ||
| [1m--- a/DetDescr/CMakeLists.txt[m | ||
| [1m+++ b/DetDescr/CMakeLists.txt[m | ||
| [36m@@ -16,32 +16,27 @@[m [msetup_test(dependencies DetDescr::DetDescr)[m | ||
| [m | ||
| option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)[m | ||
| if(BUILD_DETECTORID_BINDINGS)[m | ||
| [32m+[m[32m cmake_policy(SET CMP0167 NEW)[m | ||
| find_package(Python COMPONENTS Development)[m | ||
| [m | ||
| [31m- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")[m | ||
| [31m- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})[m | ||
| [32m+[m[32m message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")[m | ||
| [32m+[m[32m find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})[m | ||
| # libboost_python3 style libraries[m | ||
| if (NOT Boost_FOUND)[m | ||
| [31m- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")[m | ||
| [31m- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})[m | ||
| [31m- endif()[m | ||
| [31m-[m | ||
| [31m- # libboost_python style libraries[m | ||
| [31m- if (NOT Boost_FOUND)[m | ||
| [31m- message("Looking for libboost_python")[m | ||
| [31m- find_package(Boost QUIET COMPONENTS system thread python)[m | ||
| [32m+[m[32m message("Looking for libboost_python${Python_VERSION_MAJOR}")[m | ||
| [32m+[m[32m find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})[m | ||
| endif()[m | ||
| [m | ||
| # libboost_python-py36 style libraries[m | ||
| if (NOT Boost_FOUND)[m | ||
| [31m- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")[m | ||
| [31m- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})[m | ||
| [32m+[m[32m message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")[m | ||
| [32m+[m[32m find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})[m | ||
| endif()[m | ||
| [m | ||
| # libboost_python3-py36 style libraries[m | ||
| if (NOT Boost_FOUND)[m | ||
| [31m- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")[m | ||
| [31m- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})[m | ||
| [32m+[m[32m message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")[m | ||
| [32m+[m[32m find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})[m | ||
| endif()[m | ||
| [m | ||
| # Nothing worked[m | ||
| [1mdiff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt[m | ||
| [1mindex 8627fad6..8bbb2843 100644[m | ||
| [1m--- a/Framework/CMakeLists.txt[m | ||
| [1m+++ b/Framework/CMakeLists.txt[m | ||
| [36m@@ -23,11 +23,11 @@[m [msetup_library(module Framework name Configure dependencies Python3::Python)[m | ||
| # Search for the Python3 library[m | ||
| find_package(Python3 COMPONENTS Interpreter Development)[m | ||
| [m | ||
| [32m+[m[32mcmake_policy(SET CMP0167 NEW)[m | ||
| # Search for Boost[m | ||
| find_package([m | ||
| Boost REQUIRED[m | ||
| [31m- COMPONENTS system[m | ||
| [31m- log[m | ||
| [32m+[m[32m COMPONENTS log[m | ||
| filesystem[m | ||
| thread[m | ||
| chrono[m | ||
| [1mdiff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx[m | ||
| [1mindex 7c976f4f..01804ea7 100644[m | ||
| [1m--- a/Hcal/src/Hcal/HcalClusterProducer.cxx[m | ||
| [1m+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx[m | ||
| [36m@@ -2,6 +2,7 @@[m | ||
| [m | ||
| #include <exception>[m | ||
| #include <iostream>[m | ||
| [32m+[m[32m#include <list>[m | ||
| [m | ||
| #include "Hcal/MyClusterWeight.h"[m | ||
| #include "Hcal/TemplatedClusterFinder.h"[m | ||
| [1mdiff --git a/Tracking/CMakeLists.txt b/Tracking/CMakeLists.txt[m | ||
| [1mindex 2f3b4163..24e7d050 100644[m | ||
| [1m--- a/Tracking/CMakeLists.txt[m | ||
| [1m+++ b/Tracking/CMakeLists.txt[m | ||
| [36m@@ -62,7 +62,6 @@[m [mfind_package(Eigen3 CONFIG REQUIRED)[m | ||
| # if you want to try an alternate Acts, you can[m | ||
| # 1. comment out the stuff here and replace with add_subdirectory(acts)[m | ||
| # 2. git clone acts into this directory and choose your version[m | ||
| [31m-find_package(Acts QUIET)[m | ||
| if (NOT Acts_FOUND)[m | ||
| message(STATUS "Did not find Acts, downloading and compiling it here")[m | ||
| include(FetchContent)[m | ||
| [36m@@ -94,6 +93,7 @@[m [msetup_library(module Tracking[m | ||
| dependencies Framework::Configure [m | ||
| Framework::Framework [m | ||
| ActsCore[m | ||
| [32m+[m[32m Eigen3::Eigen[m | ||
| Geant4::Interface[m | ||
| ROOT::Physics[m | ||
| Tracking::Event[m | ||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <exception> | ||
| #include <iostream> | ||
| +#include <list> | ||
|
|
||
| #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) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v4.2.20.patch | ||
| v4.3.3.patch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v4.2.20.patch | ||
| v4.3.3.patch |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I accidentally included the ansi color escape sequences 😠 which causes this one to fail.
It did reveal an annoying bug in the
save-patchscript though. I havecolor.diff=alwaysin my git diff config which I should override in thesave-patchscript to avoid including the ansi escape sequences.