diff options
| author | Geoffrey Oxberry <goxberry@gmail.com> | 2018-01-21 07:16:23 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-01-21 09:16:23 -0600 |
| commit | 227b58bb67c19b342c4f26ce4903ebc429708735 (patch) | |
| tree | 3e0805c51cb76a8fb2b4cf61795c47b738403746 /var | |
| parent | 202c413ae061227de07a67fd44bcb181fd747a4e (diff) | |
| download | spack-227b58bb67c19b342c4f26ce4903ebc429708735.tar.gz spack-227b58bb67c19b342c4f26ce4903ebc429708735.tar.bz2 spack-227b58bb67c19b342c4f26ce4903ebc429708735.tar.xz spack-227b58bb67c19b342c4f26ce4903ebc429708735.zip | |
Visit 2.13.0 (#6947)
* visit: add version 2.12.3
* visit: add version 2.13.0
* visit: enable building with hdf5+mpi
* visit: add qwt dependency
Building VisIt requires Qwt, which is not part of Qt. Prior to this
commit, this dependency was not included in the VisIt spack package,
resulting in a configure-time bug with an error message indicating a
missing Qwt dependency.
This commit fixes this bug by adding Qwt dependency information.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/visit/package.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 56dec99eec..7701a9ce73 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -31,6 +31,8 @@ class Visit(CMakePackage): homepage = "https://wci.llnl.gov/simulation/computer-codes/visit/" url = "http://portal.nersc.gov/project/visit/releases/2.10.1/visit2.10.1.tar.gz" + version('2.13.0', '716644b8e78a00ff82691619d4d1e7a914965b6535884890b667b97ba08d6a0f') + version('2.12.3', '2dd351a291ee3e79926bc00391ca89b202cfa4751331b0fdee1b960c7922161f') version('2.12.2', '355779b1dbf440cdd548526eecd77b60') version('2.10.3', 'a1082a6f6dab3e2dcb58993603456c2b') version('2.10.2', '253de0837a9d69fb689befc98ea4d068') @@ -39,23 +41,30 @@ class Visit(CMakePackage): depends_on('cmake@3.0:', type='build') depends_on('vtk@6.1.0~opengl2') depends_on('qt@4.8.6') + depends_on('qwt') depends_on('python') depends_on('silo+shared') - depends_on('hdf5~mpi') + depends_on('hdf5') root_cmakelists_dir = 'src' def cmake_args(self): spec = self.spec qt_bin = spec['qt'].prefix.bin - - return [ + args = [ '-DVTK_MAJOR_VERSION={0}'.format(spec['vtk'].version[0]), '-DVTK_MINOR_VERSION={0}'.format(spec['vtk'].version[1]), + '-DVISIT_VTK_DIR:PATH={0}'.format(spec['vtk'].prefix), '-DVISIT_USE_GLEW=OFF', '-DVISIT_LOC_QMAKE_EXE:FILEPATH={0}/qmake-qt4'.format(qt_bin), '-DPYTHON_DIR:PATH={0}'.format(spec['python'].home), '-DVISIT_SILO_DIR:PATH={0}'.format(spec['silo'].prefix), '-DVISIT_HDF5_DIR:PATH={0}'.format(spec['hdf5'].prefix), - '-DVISIT_VTK_DIR:PATH={0}'.format(spec['vtk'].prefix), + '-DVISIT_QWT_DIR:PATH={0}'.format(spec['qwt'].prefix) ] + + if spec.satisfies('^hdf5+mpi', strict=True): + args.append('-DVISIT_HDF5_MPI_DIR:PATH={0}'.format( + spec['hdf5'].prefix)) + + return args |