diff options
| author | Mark Olesen <Mark.Olesen@gmx.net> | 2017-06-22 15:29:19 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-06-22 09:29:19 -0500 |
| commit | ff26cb9723d0742953671f0432bd4d55d8701cc7 (patch) | |
| tree | 44c8926bc5a9675f984be0d603ac8d3155bf909a | |
| parent | 689c1d2f0c432de7090dea593c90d7ffd6741a7d (diff) | |
| download | spack-ff26cb9723d0742953671f0432bd4d55d8701cc7.tar.gz spack-ff26cb9723d0742953671f0432bd4d55d8701cc7.tar.bz2 spack-ff26cb9723d0742953671f0432bd4d55d8701cc7.tar.xz spack-ff26cb9723d0742953671f0432bd4d55d8701cc7.zip | |
Update for paraview 5.4.0 (#4582)
- paraview 5.2.1 -> 5.4.0 supports both Qt4 and Qt5, but the assumed
default version changes between versions. So explicitly define
which QT major version is being used.
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index ea0722dab8..bf2246c6ba 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -33,6 +33,7 @@ class Paraview(CMakePackage): url = "http://www.paraview.org/files/v5.3/ParaView-v5.3.0.tar.gz" _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + version('5.4.0', 'b92847605bac9036414b644f33cb7163') version('5.3.0', '68fbbbe733aa607ec13d1db1ab5eba71') version('5.2.0', '4570d1a2a183026adb65b73c7125b8b0') version('5.1.2', '44fb32fc8988fcdfbc216c9e40c3e925') @@ -117,6 +118,13 @@ class Paraview(CMakePackage): '-DVTK_USE_SYSTEM_ZLIB:BOOL=ON', ] + # The assumed qt version changed to QT5 (as of paraview 5.2.1), + # so explicitly specify which QT major version is actually being used + if '+qt' in spec: + cmake_args.extend([ + '-DPARAVIEW_QT_VERSION=%s' % spec['qt'].version[0], + ]) + if '+python' in spec: cmake_args.extend([ '-DPARAVIEW_ENABLE_PYTHON:BOOL=ON', |