zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build of paraview (#5802)

Browse Source 
* added variant examples to paraview package.py

* qt: added libxt dependency

* add variant to use external hdf5, this is needed when compiling with gcc@4.8.5

* paraview: added python dependecies to PYTHONPATH
This commit is contained in:
Simone Bnà 2018-01-04 16:47:17 +01:00 committed by Adam J. Stewart
parent dab2dc24a5
commit 3f9ed72f68
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/paraview/package.py
View File

@ -49,6 +49,8 @@ class Paraview(CMakePackage):
variant('osmesa', default=False, description='Enable OSMesa support') variant('osmesa', default=False, description='Enable OSMesa support')
variant('qt', default=False, description='Enable Qt (gui) support') variant('qt', default=False, description='Enable Qt (gui) support')
variant('opengl2', default=True, description='Enable OpenGL2 backend') variant('opengl2', default=True, description='Enable OpenGL2 backend')
variant('examples', default=False, description="Build examples")
variant('hdf5', default=False, description="Use external HDF5")
depends_on('python@2:2.8', when='+python') depends_on('python@2:2.8', when='+python')
depends_on('py-numpy', when='+python', type='run') depends_on('py-numpy', when='+python', type='run')
@ -59,12 +61,15 @@ class Paraview(CMakePackage):
depends_on('qt@:4', when='@:5.2.0+qt') depends_on('qt@:4', when='@:5.2.0+qt')
depends_on('mesa+swrender', when='+osmesa') depends_on('mesa+swrender', when='+osmesa')
depends_on('libxt', when='+qt')
conflicts('+qt', when='+osmesa') conflicts('+qt', when='+osmesa')
depends_on('bzip2') depends_on('bzip2')
depends_on('freetype') depends_on('freetype')
# depends_on('hdf5+mpi', when='+mpi') # depends_on('hdf5+mpi', when='+mpi')
# depends_on('hdf5~mpi', when='~mpi') # depends_on('hdf5~mpi', when='~mpi')
depends_on('hdf5+hl+mpi', when='+hdf5+mpi')
depends_on('hdf5+hl~mpi', when='+hdf5~mpi')
depends_on('jpeg') depends_on('jpeg')
depends_on('libpng') depends_on('libpng')
depends_on('libtiff') depends_on('libtiff')
@ -101,6 +106,13 @@ def setup_environment(self, spack_env, run_env):
paraview_version)) paraview_version))
run_env.prepend_path('LD_LIBRARY_PATH', join_path(lib_dir, run_env.prepend_path('LD_LIBRARY_PATH', join_path(lib_dir,
paraview_version)) paraview_version))
if '+python' in self.spec:
run_env.prepend_path('PYTHONPATH', join_path(lib_dir,
paraview_version))
run_env.prepend_path('PYTHONPATH', join_path(lib_dir,
paraview_version, 'site-packages'))
run_env.prepend_path('PYTHONPATH', join_path(lib_dir,
paraview_version, 'site-packages', 'vtk'))
def cmake_args(self): def cmake_args(self):
"""Populate cmake arguments for ParaView.""" """Populate cmake arguments for ParaView."""
@ -126,8 +138,9 @@ def nvariant_bool(feature):
'-DVTK_RENDERING_BACKEND:STRING=%s' % rendering, '-DVTK_RENDERING_BACKEND:STRING=%s' % rendering,
'-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=%s' % includes, '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=%s' % includes,
'-DBUILD_TESTING:BOOL=OFF', '-DBUILD_TESTING:BOOL=OFF',
'-DBUILD_EXAMPLES:BOOL=%s' % variant_bool('+examples'),
'-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON', '-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON',
'-DVTK_USE_SYSTEM_HDF5:BOOL=OFF', '-DVTK_USE_SYSTEM_HDF5:BOOL=%s' % variant_bool('+hdf5'),
'-DVTK_USE_SYSTEM_JPEG:BOOL=ON', '-DVTK_USE_SYSTEM_JPEG:BOOL=ON',
'-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON', '-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON',
'-DVTK_USE_SYSTEM_NETCDF:BOOL=OFF', '-DVTK_USE_SYSTEM_NETCDF:BOOL=OFF',