diff options
| author | Sinan <sbulutw@gmail.com> | 2020-01-02 17:18:27 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2020-01-02 19:18:27 -0600 |
| commit | 39a09691c555ea26c03742b2163519e3a06214b2 (patch) | |
| tree | 1f528d9b0f50b66d9ae14ef76c477cb4d36f9ec0 | |
| parent | e46548c3b8849053644bcbfe32a664356b3e4011 (diff) | |
| download | spack-39a09691c555ea26c03742b2163519e3a06214b2.tar.gz spack-39a09691c555ea26c03742b2163519e3a06214b2.tar.bz2 spack-39a09691c555ea26c03742b2163519e3a06214b2.tar.xz spack-39a09691c555ea26c03742b2163519e3a06214b2.zip | |
package/opencv fix mistake in conflict statement involving gcc (#13959)
* fix mistake in conflict
* extend CudaPackage to resolve cuda-gcc conflicts
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 5 |
1 files changed, 1 insertions, 4 deletions
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') |