diff options
| author | Jon Rood <jon.rood@nrel.gov> | 2017-10-16 15:32:23 -0600 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-10-16 15:32:23 -0600 |
| commit | 890c5ad329fd6668074c94bf448f2209c0eff4a6 (patch) | |
| tree | 4dc6e29aca90f020274d471a350202cbdc858741 | |
| parent | 639d9c305a263787773533f5af492d956fc893fa (diff) | |
| download | spack-890c5ad329fd6668074c94bf448f2209c0eff4a6.tar.gz spack-890c5ad329fd6668074c94bf448f2209c0eff4a6.tar.bz2 spack-890c5ad329fd6668074c94bf448f2209c0eff4a6.tar.xz spack-890c5ad329fd6668074c94bf448f2209c0eff4a6.zip | |
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.
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 9 |
1 files changed, 8 insertions, 1 deletions
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 |