diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/visit/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/visit/package.py | 63 |
1 files changed, 44 insertions, 19 deletions
diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 4ec7326f29..4c7e25e693 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -10,8 +10,10 @@ class Visit(CMakePackage): """VisIt is an Open Source, interactive, scalable, visualization, animation and analysis tool.""" 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" + url = "https://portal.nersc.gov/project/visit/releases/3.0.1/visit3.0.1.tar.gz" + version('3.0.1', 'a506d4d83b8973829e68787d8d721199523ce7ec73e7594e93333c214c2c12bd') + version('2.13.3', 'cf0b3d2e39e1cd102dd886d3ef6da892733445e362fc28f24d9682012cccf2e5') version('2.13.0', '716644b8e78a00ff82691619d4d1e7a914965b6535884890b667b97ba08d6a0f') version('2.12.3', '2dd351a291ee3e79926bc00391ca89b202cfa4751331b0fdee1b960c7922161f') version('2.12.2', '355779b1dbf440cdd548526eecd77b60') @@ -20,61 +22,84 @@ class Visit(CMakePackage): version('2.10.1', '3cbca162fdb0249f17c4456605c4211e') variant('gui', default=True, description='Enable VisIt\'s GUI') + variant('adios2', default=False, description='Enable ADIOS2 file format') variant('hdf5', default=True, description='Enable HDF5 file format') variant('silo', default=True, description='Enable Silo file format') variant('python', default=True, description='Enable Python support') variant('mpi', default=True, description='Enable parallel engine') + patch('spack-changes.patch') + patch('nonframework-qwt.patch', when='^qt~framework platform=darwin') + depends_on('cmake@3.0:', type='build') - depends_on('vtk@6.1.0~opengl2~mpi') - depends_on('qt@4.8.6', when='+gui') + depends_on('vtk@8.1.0:+opengl2', when='@3.0:3.0.1') + depends_on('vtk@6.1.0~opengl2', when='@:2.999') + depends_on('vtk+python', when='+python @3.0:') + depends_on('vtk~mpi') + depends_on('vtk+qt', when='+gui') + depends_on('qt@4.8.6:4.999', when='+gui @:2.999') + depends_on('qt@5.10:', when='+gui @3.0:') depends_on('qwt', when='+gui') - depends_on('python', when='+python') + depends_on('python@2.6:2.8', when='+python') depends_on('silo+shared', when='+silo') depends_on('hdf5', when='+hdf5') depends_on('mpi', when='+mpi') + depends_on('adios2', when='+adios2') - conflicts('+hdf5', when='~gui') - conflicts('+silo', when='~gui') + conflicts('+adios2', when='@:2.999') + conflicts('+hdf5', when='~gui @:2.999') + conflicts('+silo', when='~gui @:2.999') root_cmakelists_dir = 'src' + @when('@3.0.0:3.0.1') + def patch(self): + # Some of VTK's targets don't create explicit libraries, so there is no + # 'vtktiff'. Instead, replace with the library variable defined from + # VTK's module flies (e.g. lib/cmake/vtk-8.1/Modules/vtktiff.cmake) + for filename in find('src', 'CMakeLists.txt'): + filter_file(r'\bvtk(tiff|jpeg|png)', r'${vtk\1_LIBRARIES}', + filename) + def cmake_args(self): spec = self.spec 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), + '-DVTK_MAJOR_VERSION=' + str(spec['vtk'].version[0]), + '-DVTK_MINOR_VERSION=' + str(spec['vtk'].version[1]), + '-DVISIT_VTK_DIR:PATH=' + spec['vtk'].prefix, + '-DVISIT_ZLIB_DIR:PATH=' + spec['zlib'].prefix, '-DVISIT_USE_GLEW=OFF', - '-DCMAKE_CXX_FLAGS=-fPIC', - '-DCMAKE_C_FLAGS=-fPIC' + '-DCMAKE_CXX_FLAGS=' + self.compiler.pic_flag, + '-DCMAKE_C_FLAGS=' + self.compiler.pic_flag, ] - if(spec.variants['python'].value): + if '+python' in spec: args.append('-DPYTHON_DIR:PATH={0}'.format(spec['python'].home)) - if(spec.variants['gui'].value): + if '+gui' in spec: qt_bin = spec['qt'].prefix.bin - args.append( - '-DVISIT_LOC_QMAKE_EXE:FILEPATH={0}/qmake-qt4'.format(qt_bin)) - args.append('-DVISIT_QWT_DIR:PATH={0}'.format(spec['qwt'].prefix)) + args.extend([ + '-DVISIT_LOC_QMAKE_EXE:FILEPATH={0}/qmake'.format(qt_bin), + '-DVISIT_QT_DIR:PATH=' + spec['qt'].prefix, + '-DVISIT_QWT_DIR:PATH=' + spec['qwt'].prefix + ]) else: args.append('-DVISIT_SERVER_COMPONENTS_ONLY=ON') args.append('-DVISIT_ENGINE_ONLY=ON') - if(spec.variants['hdf5'].value): + if '+hdf5' in spec: args.append( '-DVISIT_HDF5_DIR:PATH={0}'.format(spec['hdf5'].prefix)) if spec.satisfies('^hdf5+mpi', strict=True): args.append('-DVISIT_HDF5_MPI_DIR:PATH={0}'.format( spec['hdf5'].prefix)) - if(spec.variants['silo'].value): + if '+silo' in spec: args.append( '-DVISIT_SILO_DIR:PATH={0}'.format(spec['silo'].prefix)) - if(spec.variants['mpi'].value): + if '+mpi' in spec: args.append('-DVISIT_PARALLEL=ON') args.append('-DVISIT_C_COMPILER={0}'.format(spec['mpi'].mpicc)) args.append('-DVISIT_CXX_COMPILER={0}'.format(spec['mpi'].mpicxx)) |