diff options
| author | Valentin Volkl <valentin.volkl@cern.ch> | 2023-06-20 15:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 08:47:49 -0500 |
| commit | f46106988840acea4cf8e04a31c665db3334e2d7 (patch) | |
| tree | 1484dd7df27ca7234255a8f1781a4d7fe7241fde /var | |
| parent | 9eb3de85c5369260bc702ac5e1d257ff58aec4fe (diff) | |
| download | spack-f46106988840acea4cf8e04a31c665db3334e2d7.tar.gz spack-f46106988840acea4cf8e04a31c665db3334e2d7.tar.bz2 spack-f46106988840acea4cf8e04a31c665db3334e2d7.tar.xz spack-f46106988840acea4cf8e04a31c665db3334e2d7.zip | |
root: fix variant detection (#38436)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index a400051e92..347eb46d0f 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -408,8 +408,11 @@ class Root(CMakePackage): _add_variant(v, f, ("qt", "qtgsi"), "+qt4") _add_variant(v, f, "r", "+r") _add_variant(v, f, "roofit", "+roofit") - _add_variant(v, f, ("root7", "webgui"), "+webgui") # for root version >= 6.18.00 - _add_variant(v, f, ("root7", "webui"), "+webgui") # for root version <= 6.17.02 + # webui feature renamed to webgui in 6.18 + if Version(version_str).satisfies("@6.18:"): + _add_variant(v, f, ("root7", "webgui"), "+webgui") + else: + _add_variant(v, f, ("root7", "webui"), "+webgui") _add_variant(v, f, "rpath", "+rpath") _add_variant(v, f, "shadowpw", "+shadow") _add_variant(v, f, "spectrum", "+spectrum") |