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

package/opencv fix mistake in conflict statement involving gcc (#13959)

Browse source 
* fix mistake in conflict

* extend CudaPackage to resolve cuda-gcc conflicts
This commit is contained in:
Sinan 2020-01-02 17:18:27 -08:00 committed by Adam J. Stewart
parent e46548c3b8
commit 39a09691c5
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
from spack import * from spack import *
class Opencv(CMakePackage): class Opencv(CMakePackage, CudaPackage):
"""OpenCV is released under a BSD license and hence it's free for both """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 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 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') variant('videoio', default=True, description='videoio module')
# Optional 3rd party components # 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('eigen', default=True, description='Activates support for eigen')
variant('ipp', default=True, description='Activates support for IPP') variant('ipp', default=True, description='Activates support for IPP')
variant('ipp_iw', default=True, description='Build IPP IW from source') variant('ipp_iw', default=True, description='Build IPP IW from source')