diff options
| author | Joseph Ciurej <ciurej1@llnl.gov> | 2016-10-28 17:59:21 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-10-28 17:59:21 -0700 |
| commit | c82985cb5e280981a1064855f1577c9a22ac5700 (patch) | |
| tree | 5a594cc725dca44049a78ac871c331e520b18aec /var/spack/repos/builtin/packages/visit | |
| parent | 58409a2eaf8ea625524e31b72be228c06adf0d9b (diff) | |
| download | spack-c82985cb5e280981a1064855f1577c9a22ac5700.tar.gz spack-c82985cb5e280981a1064855f1577c9a22ac5700.tar.bz2 spack-c82985cb5e280981a1064855f1577c9a22ac5700.tar.xz spack-c82985cb5e280981a1064855f1577c9a22ac5700.zip | |
Update and Clean Up the Visit and VTK Packages (#2167)
* Made some refactoring improvements to the 'visit' and 'vtk' packages.
* Added a small fix for the 'vtk' package when building with 'qt+webkit'.
Diffstat (limited to 'var/spack/repos/builtin/packages/visit')
| -rw-r--r-- | var/spack/repos/builtin/packages/visit/package.py | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 5d2ab24cc5..ba1224daee 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -35,28 +35,30 @@ class Visit(Package): version('2.10.2', '253de0837a9d69fb689befc98ea4d068') version('2.10.1', '3cbca162fdb0249f17c4456605c4211e') - depends_on("vtk@6.1.0~opengl2") - depends_on("qt@4.8.6") - depends_on("python") - depends_on("silo+shared") - depends_on("hdf5~mpi") + depends_on('cmake', type='build') + depends_on('vtk@6.1.0~opengl2') + depends_on('qt@4.8.6') + depends_on('python') + depends_on('silo+shared') + depends_on('hdf5~mpi') def install(self, spec, prefix): - with working_dir('spack-build', create=True): - - feature_args = std_cmake_args[:] - feature_args.extend([ - "-DVTK_MAJOR_VERSION=6", - "-DVTK_MINOR_VERSION=1", - "-DVISIT_USE_GLEW=OFF", - "-DVISIT_LOC_QMAKE_EXE:FILEPATH=%s/qmake-qt4" % spec[ - 'qt'].prefix.bin, - "-DPYTHON_EXECUTABLE:FILEPATH=%s/python" % spec[ - 'python'].prefix.bin, - "-DVISIT_SILO_DIR:PATH=%s" % spec['silo'].prefix, - "-DVISIT_HDF5_DIR:PATH=%s" % spec['hdf5'].prefix]) + qt_bin = spec['qt'].prefix.bin + python_bin = spec['python'].prefix.bin - cmake('../src', *feature_args) + with working_dir('spack-build', create=True): + cmake_args = std_cmake_args[:] + cmake_args.extend([ + '-DVTK_MAJOR_VERSION=6', + '-DVTK_MINOR_VERSION=1', + '-DVISIT_USE_GLEW=OFF', + '-DVISIT_LOC_QMAKE_EXE:FILEPATH={0}/qmake-qt4'.format(qt_bin), + '-DPYTHON_EXECUTABLE:FILEPATH={0}/python'.format(python_bin), + '-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), + ]) + cmake(join_path('..', 'src'), *cmake_args) make() - make("install") + make('install') |