From 39a09691c555ea26c03742b2163519e3a06214b2 Mon Sep 17 00:00:00 2001 From: Sinan Date: Thu, 2 Jan 2020 17:18:27 -0800 Subject: package/opencv fix mistake in conflict statement involving gcc (#13959) * fix mistake in conflict * extend CudaPackage to resolve cuda-gcc conflicts --- var/spack/repos/builtin/packages/opencv/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 49065aa752..6bbb365169 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -6,7 +6,7 @@ from spack import * -class Opencv(CMakePackage): +class Opencv(CMakePackage, CudaPackage): """OpenCV is released under a BSD license and hence it's free for both academic and commercial use. It has C++, C, Python and Java interfaces and supports Windows, Linux, Mac OS, iOS and Android. OpenCV was designed for @@ -78,9 +78,6 @@ class Opencv(CMakePackage): variant('videoio', default=True, description='videoio module') # Optional 3rd party components - variant('cuda', default=True, description='Activates support for CUDA') - # Cuda@10.0.130 does not support gcc > 7 - conflicts('%gcc@7:', when='+cuda') variant('eigen', default=True, description='Activates support for eigen') variant('ipp', default=True, description='Activates support for IPP') variant('ipp_iw', default=True, description='Build IPP IW from source') -- cgit v1.2.3-70-g09d2