From 890c5ad329fd6668074c94bf448f2209c0eff4a6 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 16 Oct 2017 15:32:23 -0600 Subject: Forcing Paraview to avoid using git describe to determine its own version number (#5783) * Forcing Paraview to avoid using git describe to determine its own version number. * Shortening references to spec in paraview. --- var/spack/repos/builtin/packages/paraview/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 2ac2c94b46..879924706a 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -141,10 +141,17 @@ class Paraview(CMakePackage): '-DMPIEXEC:FILEPATH=%s/bin/mpiexec' % spec['mpi'].prefix ]) - if 'darwin' in self.spec.architecture: + if 'darwin' in spec.architecture: cmake_args.extend([ '-DVTK_USE_X:BOOL=OFF', '-DPARAVIEW_DO_UNIX_STYLE_INSTALLS: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'): + cmake_args.extend([ + '-DGIT_EXECUTABLE=FALSE' + ]) + return cmake_args -- cgit v1.2.3-70-g09d2