From 6f796525a7a1ce87fb872a4544500b50404b7095 Mon Sep 17 00:00:00 2001 From: Andreas Salzburger Date: Tue, 24 Sep 2024 19:23:39 +0200 Subject: [PATCH] chore: update ACTSVG version (#3643) This PR updates the ACTSVG version in order to prepare for new plotting functionality to be included. --- CMakeLists.txt | 2 +- Examples/Python/src/Base.cpp | 1 + .../include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp | 8 ++++---- cmake/ActsExternSources.cmake | 2 +- thirdparty/actsvg/CMakeLists.txt | 6 ++++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75bb59c4336..86c4dc40328 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,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.47) +set(_acts_actsvg_version 0.4.50) set(_acts_boost_version 1.71.0) set(_acts_dd4hep_version 1.21) set(_acts_edm4hep_version 0.7) diff --git a/Examples/Python/src/Base.cpp b/Examples/Python/src/Base.cpp index e92e4d17895..1f149820d9a 100644 --- a/Examples/Python/src/Base.cpp +++ b/Examples/Python/src/Base.cpp @@ -26,6 +26,7 @@ #include #include +#include #include namespace py = pybind11; diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp index 7349a0086ab..817c19db6c5 100644 --- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp +++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp @@ -55,7 +55,7 @@ namespace View { static inline actsvg::svg::object xy(const ProtoSurface& pSurface, const std::string& identification) { actsvg::views::x_y xyView; - return actsvg::display::surface(identification, pSurface, xyView, true); + return actsvg::display::surface(identification, pSurface, xyView); } /// Convert into an acts::svg::object with an z-r view @@ -67,7 +67,7 @@ static inline actsvg::svg::object xy(const ProtoSurface& pSurface, static inline actsvg::svg::object zr(const ProtoSurface& pSurface, const std::string& identification) { actsvg::views::z_r zrView; - return actsvg::display::surface(identification, pSurface, zrView, true); + return actsvg::display::surface(identification, pSurface, zrView); } /// Convert into an acts::svg::object with an z-phi view @@ -79,7 +79,7 @@ static inline actsvg::svg::object zr(const ProtoSurface& pSurface, static inline actsvg::svg::object zphi(const ProtoSurface& pSurface, const std::string& identification) { actsvg::views::z_phi zphiView; - return actsvg::display::surface(identification, pSurface, zphiView, true); + return actsvg::display::surface(identification, pSurface, zphiView); } /// Convert into an acts::svg::object with an z-rphi view @@ -94,7 +94,7 @@ static inline actsvg::svg::object zrphi(const ProtoSurface& pSurface, const std::string& identification) { actsvg::views::z_rphi zrphiView; zrphiView._fixed_r = pSurface._radii[0u]; - return actsvg::display::surface(identification, pSurface, zrphiView, true); + return actsvg::display::surface(identification, pSurface, zrphiView); } } // namespace View diff --git a/cmake/ActsExternSources.cmake b/cmake/ActsExternSources.cmake index 3352fec959a..65bfa392875 100644 --- a/cmake/ActsExternSources.cmake +++ b/cmake/ActsExternSources.cmake @@ -1,5 +1,5 @@ set(ACTS_ACTSVG_SOURCE - "URL;https://github.com/acts-project/actsvg/archive/refs/tags/v${_acts_actsvg_version}.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=8073a371465ce2edef3bfdba5eae900e17ee61ae21766111ad1834e29250f304" CACHE STRING "Source to take ACTSVG from" ) diff --git a/thirdparty/actsvg/CMakeLists.txt b/thirdparty/actsvg/CMakeLists.txt index 1fea9d85b2b..e74e5cd0619 100644 --- a/thirdparty/actsvg/CMakeLists.txt +++ b/thirdparty/actsvg/CMakeLists.txt @@ -14,5 +14,11 @@ message(STATUS "Building actsvg as part of the ACTS project") FetchContent_Declare(actsvg ${ACTS_ACTSVG_SOURCE}) +set(ACTSVG_BUILD_PYTHON_BINDINGS + OFF + CACHE BOOL + "Do not build the Python bindings for actsvg" +) + # Now set up its build. FetchContent_MakeAvailable(actsvg)