diff options
| author | Sergey Kosukhin <skosukhin@gmail.com> | 2017-08-24 10:30:35 +0200 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2017-08-24 10:30:35 +0200 |
| commit | a48b5a627cb4fd18f7bd145e6bb944d5a315cfdb (patch) | |
| tree | feafbcf834cb9ee882913c729ace3df3d5cf81bc /var/spack/repos/builtin/packages/opencv/package.py | |
| parent | 49a9d63be74e3e5ee4dc1b91aa4004b7f78953d3 (diff) | |
| download | spack-a48b5a627cb4fd18f7bd145e6bb944d5a315cfdb.tar.gz spack-a48b5a627cb4fd18f7bd145e6bb944d5a315cfdb.tar.bz2 spack-a48b5a627cb4fd18f7bd145e6bb944d5a315cfdb.tar.xz spack-a48b5a627cb4fd18f7bd145e6bb944d5a315cfdb.zip | |
Make jpeg a virtual dependency. (#5190)
* Make jpeg a virtual dependency.
* Make 'libjpeg-turbo' the default implementation of 'jpeg'.
Diffstat (limited to 'var/spack/repos/builtin/packages/opencv/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 034fe54cc9..5587a893dc 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -80,8 +80,8 @@ class Opencv(CMakePackage): depends_on('zlib', when='+zlib') depends_on('libpng', when='+png') - depends_on('libjpeg-turbo', when='+jpeg') - depends_on('libtiff+turbo', when='+tiff') + depends_on('jpeg', when='+jpeg') + depends_on('libtiff', when='+tiff') depends_on('jasper', when='+jasper') depends_on('cuda', when='+cuda') @@ -150,7 +150,7 @@ class Opencv(CMakePackage): ]) if '+jpeg' in spec: - libjpeg = spec['libjpeg-turbo'] + libjpeg = spec['jpeg'] args.extend([ '-DBUILD_JPEG:BOOL=OFF', '-DJPEG_LIBRARY:FILEPATH={0}'.format( |