From 0b2ab33dee3ca2d2d4d9430dbc845895a335744b Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 8 Aug 2022 09:27:13 -0500 Subject: acts: add v19.4.0 and v19.5.0 (#31773) --- var/spack/repos/builtin/packages/acts/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index 5ff6c7b84a..91a45131e1 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -39,6 +39,8 @@ class Acts(CMakePackage, CudaPackage): # Supported Acts versions version("main", branch="main") version("master", branch="main", deprecated=True) # For compatibility + version("19.5.0", commit="bf9f0270eadd8e78d283557b7c9070b80dece4a7", submodules=True) + version("19.4.0", commit="498af243755219486c26d32fb125b7ebf2557166", submodules=True) version("19.3.0", commit="747053f60254c5ad3aa1fe7b18ae89c19029f4a6", submodules=True) version("19.2.0", commit="adf079e0f7e278837093bf53988da73730804e22", submodules=True) version("19.1.0", commit="82f42a2cc80d4259db251275c09b84ee97a7bd22", submodules=True) @@ -188,6 +190,12 @@ class Acts(CMakePackage, CudaPackage): variant("tgeo", default=False, description="Build the TGeo plugin", when="+identification") # Variants that only affect Acts examples for now + variant( + "edm4hep", + default=False, + description="Build the EDM4hep examples", + when="@19.4.0: +examples", + ) variant( "geant4", default=False, @@ -225,6 +233,7 @@ class Acts(CMakePackage, CudaPackage): depends_on("cmake @3.14:", type="build") depends_on("dd4hep @1.11: +dddetectors +ddrec", when="+dd4hep") depends_on("dd4hep +ddg4", when="+dd4hep +geant4 +examples") + depends_on("edm4hep @0.4.1:", when="+edm4hep") depends_on("eigen @3.3.7:", when="@15.1:") depends_on("eigen @3.3.7:3.3.99", when="@:15.0") depends_on("geant4", when="+fatras_geant4") @@ -287,6 +296,7 @@ class Acts(CMakePackage, CudaPackage): plugin_cmake_variant("CUDA", "cuda"), plugin_cmake_variant("DD4HEP", "dd4hep"), example_cmake_variant("DD4HEP", "dd4hep"), + example_cmake_variant("EDM4HEP", "edm4hep"), cmake_variant("EXAMPLES", "examples"), cmake_variant("FATRAS", "fatras"), cmake_variant("FATRAS_GEANT4", "fatras_geant4"), @@ -308,6 +318,8 @@ class Acts(CMakePackage, CudaPackage): log_failure_threshold = spec.variants["log_failure_threshold"].value args.append("-DACTS_LOG_FAILURE_THRESHOLD={0}".format(log_failure_threshold)) + if spec.satisfies("@19.4.0:"): + args.append("-DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON") if spec.satisfies("+autodiff"): args.append("-DACTS_USE_SYSTEM_AUTODIFF=ON") -- cgit v1.2.3-70-g09d2