From 154a4428176ec3024529972478db71d351e57c48 Mon Sep 17 00:00:00 2001 From: Utkarsh Ayachit Date: Mon, 18 May 2020 13:59:40 -0400 Subject: [PATCH] paraview: use kits by default (#16698) Adding a variant to enable/disable kits and making the default use kits. --- .../repos/builtin/packages/paraview/package.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 48dff877e0..f9e10b1fba 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -47,6 +47,8 @@ class Paraview(CMakePackage, CudaPackage): variant('hdf5', default=False, description="Use external HDF5") variant('shared', default=True, description='Builds a shared version of the library') + variant('kits', default=True, + description='Use module kits') conflicts('+python', when='+python3') conflicts('+python', when='@5.6:') @@ -271,6 +273,17 @@ def nvariant_bool(feature): '-DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON', ]) + if '+kits' in spec: + if spec.satisfies('@5.0:5.6'): + cmake_args.append( + '-DVTK_ENABLE_KITS:BOOL=ON') + elif spec.satisfies('@5.7'): + cmake_args.append( + '-DPARAVIEW_ENABLE_KITS:BOOL=ON') + else: + cmake_args.append( + '-DPARAVIEW_BUILD_WITH_KITS:BOOL=ON') + # Hide git from Paraview so it will not use `git describe` # to find its own version number if spec.satisfies('@5.4.0:5.4.1'):