hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Opencv: fix dependencies and variants (#5232)

Browse source 
Fixes #5159

* Added dependency on google protobuf when using v3.3.0.
* Set default for variant core to be true.
This commit is contained in:
Brian Van Essen 2017-09-20 21:37:52 -07:00 committed by scheibelp
parent 41a656a032
commit 96927deb30
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/opencv/package.py
View file

@ -68,7 +68,7 @@ class Opencv(CMakePackage):
variant('java', default=False, variant('java', default=False,
description='Activates support for Java') description='Activates support for Java')
variant('openmp', default=False, description='Activates support for OpenMP threads') variant('openmp', default=False, description='Activates support for OpenMP threads')
variant('core', default=False, description='Include opencv_core module into the OpenCV build') variant('core', default=True, description='Include opencv_core module into the OpenCV build')
variant('highgui', default=False, description='Include opencv_highgui module into the OpenCV build') variant('highgui', default=False, description='Include opencv_highgui module into the OpenCV build')
variant('imgproc', default=False, description='Include opencv_imgproc module into the OpenCV build') variant('imgproc', default=False, description='Include opencv_imgproc module into the OpenCV build')
variant('jpeg', default=False, description='Include JPEG support') variant('jpeg', default=False, description='Include JPEG support')
@ -90,6 +90,7 @@ class Opencv(CMakePackage):
depends_on('qt', when='+qt') depends_on('qt', when='+qt')
depends_on('java', when='+java') depends_on('java', when='+java')
depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('py-numpy', when='+python', type=('build', 'run'))
depends_on('protobuf@3.1.0', when='@3.3.0:')
extends('python', when='+python') extends('python', when='+python')