From 0a40bb72e8df95216b2be5fd17d48c8297a79dd4 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Tue, 12 Dec 2023 19:30:06 +0100 Subject: genfit: Add latest tags and update root dependency (#41572) --- var/spack/repos/builtin/packages/genfit/package.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/genfit/package.py b/var/spack/repos/builtin/packages/genfit/package.py index 182f366020..eef453201f 100644 --- a/var/spack/repos/builtin/packages/genfit/package.py +++ b/var/spack/repos/builtin/packages/genfit/package.py @@ -19,6 +19,10 @@ class Genfit(CMakePackage): tags = ["hep"] version("master", branch="master") + version("02-00-05", sha256="8c37d1692e592f9f28a145c38aa41b0a6ed9211947846e9d10e34a2759ee446e") + version("02-00-04", sha256="b833e40cfe5343424262d28f9cb715fc80255313a985508453ac17c3a522b273") + version("02-00-03", sha256="23bb4c26740be96bd7933d30f3b683c6246b8f349116bc43d1c85117682e7a4b") + version("02-00-02", sha256="b415abec7466d7fd15de6c37cd970c07a6581fe303fdfa3a8bc9258ea1c19d7d") version("02-00-01", sha256="e5a3eabf1ab53178fbd40aff0a8071bf48bac558ba1b798769106ccf230c4120") version("02-00-00", sha256="0bfd5dd152ad0573daa4153a731945824e0ce266f844988b6a8bebafb7f2dacc") # Untagged version from 2017-06-23 known to work with root@6.16.00 @@ -29,14 +33,18 @@ class Genfit(CMakePackage): depends_on("eigen") depends_on("googletest") + # See https://github.com/GenFit/GenFit/pull/127 + conflicts("root@6.30:", when="@:02-00-04", msg="genfit cannot be built against root@6.30 ") + def cmake_args(self): args = [] - # normally, as a cmake package root should be - # automatically picked up after 'depends_on' - # as it is added to CMAKE_PREFIX_PATH - # but genfit cooks its own root cmake config - # so this workaround is needed for now. - root_prefix = self.spec["root"].prefix - args.append("-DROOT_DIR=%s" % root_prefix) + if self.spec.satisfies("@:02-00-04"): + # normally, as a cmake package root should be + # automatically picked up after 'depends_on' + # as it is added to CMAKE_PREFIX_PATH + # but genfit cooks its own root cmake config + # so this workaround is needed for now. + root_prefix = self.spec["root"].prefix + args.append("-DROOT_DIR=%s" % root_prefix) return args -- cgit v1.2.3-60-g2f50