diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2017-09-20 21:37:52 -0700 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2017-09-20 21:37:52 -0700 |
| commit | 96927deb30a05d5aea86711223e3a127572983e4 (patch) | |
| tree | 18719b09f1aa921170733bb9320bc51ebeea1eb7 /var | |
| parent | 41a656a032b9bdb492140f6de0a8964a0c879bab (diff) | |
| download | spack-96927deb30a05d5aea86711223e3a127572983e4.tar.gz spack-96927deb30a05d5aea86711223e3a127572983e4.tar.bz2 spack-96927deb30a05d5aea86711223e3a127572983e4.tar.xz spack-96927deb30a05d5aea86711223e3a127572983e4.zip | |
Opencv: fix dependencies and variants (#5232)
Fixes #5159
* Added dependency on google protobuf when using v3.3.0.
* Set default for variant core to be true.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index adddbc1857..41766da0de 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -68,7 +68,7 @@ class Opencv(CMakePackage): variant('java', default=False, description='Activates support for Java') 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('imgproc', default=False, description='Include opencv_imgproc module into the OpenCV build') variant('jpeg', default=False, description='Include JPEG support') @@ -90,6 +90,7 @@ class Opencv(CMakePackage): depends_on('qt', when='+qt') depends_on('java', when='+java') depends_on('py-numpy', when='+python', type=('build', 'run')) + depends_on('protobuf@3.1.0', when='@3.3.0:') extends('python', when='+python') |