Make jpeg a virtual dependency. (#5190)

* Make jpeg a virtual dependency.

* Make 'libjpeg-turbo' the default implementation of 'jpeg'.
This commit is contained in:
Sergey Kosukhin
2017-08-24 10:30:35 +02:00
committed by Massimiliano Culpo
parent 49a9d63be7
commit a48b5a627c
9 changed files with 50 additions and 11 deletions

View File

@@ -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 @@ def cmake_args(self):
])
if '+jpeg' in spec:
libjpeg = spec['libjpeg-turbo']
libjpeg = spec['jpeg']
args.extend([
'-DBUILD_JPEG:BOOL=OFF',
'-DJPEG_LIBRARY:FILEPATH={0}'.format(