summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarvinbernhardt <marvinbernhardt@users.noreply.github.com>2019-06-13 05:02:20 +0200
committerChristoph Junghans <junghans@lanl.gov>2019-06-12 21:02:20 -0600
commit4f2144a68eb76012b3e199f3f7b4b1786451fea2 (patch)
tree653092c438b02cdfcb81ae26546dc733127fd165
parent16530f84be04b8466769b9b74fe920d67006b988 (diff)
downloadspack-4f2144a68eb76012b3e199f3f7b4b1786451fea2.tar.gz
spack-4f2144a68eb76012b3e199f3f7b4b1786451fea2.tar.bz2
spack-4f2144a68eb76012b3e199f3f7b4b1786451fea2.tar.xz
spack-4f2144a68eb76012b3e199f3f7b4b1786451fea2.zip
added jpeg,png,ffmpeg variants to lammps (#10404)
-rw-r--r--var/spack/repos/builtin/packages/lammps/package.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py
index fafbcb4057..9110152919 100644
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -59,6 +59,12 @@ class Lammps(CMakePackage):
description='Build the liblammps in addition to the executable')
variant('mpi', default=True,
description='Build with mpi')
+ variant('jpeg', default=True,
+ description='Build with jpeg support')
+ variant('png', default=True,
+ description='Build with png support')
+ variant('ffmpeg', default=True,
+ description='Build with ffmpeg support')
variant('openmp', default=True, description='Build with OpenMP')
variant('exceptions', default=False,
description='Build with lammps exceptions')
@@ -79,6 +85,9 @@ class Lammps(CMakePackage):
depends_on('mpi', when='+user-lb')
depends_on('mpi', when='+user-h5md')
depends_on('hdf5', when='+user-h5md')
+ depends_on('libjpeg', when='+jpeg')
+ depends_on('libpng', when='+png')
+ depends_on('ffmpeg', when='+ffmpeg')
conflicts('+body', when='+poems@:20180628')
conflicts('+latte', when='@:20170921')
@@ -119,6 +128,13 @@ class Lammps(CMakePackage):
if spec.satisfies('@20180629:+lib'):
args.append('-DBUILD_LIB=ON')
+ args.append('-DWITH_JPEG={0}'.format(
+ 'ON' if '+jpeg' in spec else 'OFF'))
+ args.append('-DWITH_PNG={0}'.format(
+ 'ON' if '+png' in spec else 'OFF'))
+ args.append('-DWITH_FFMPEG={0}'.format(
+ 'ON' if '+ffmpeg' in spec else 'OFF'))
+
for pkg in self.supported_packages:
opt = '-D{0}_{1}'.format(pkg_prefix, pkg.upper())
if '+{0}'.format(pkg) in spec: