zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opencv: fixed conflict firectives (missing '^') (#19645)

Browse Source 
See https://github.com/spack/spack/pull/19501#issuecomment-718406357
This commit is contained in:
Massimiliano Culpo 2020-11-01 01:05:13 +01:00 committed by GitHub
parent 6b35324cf3
commit 77fc458d29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/opencv/package.py
View File

@ -2,10 +2,6 @@
# Spack Project Developers. See the top-level COPYRIGHT file for details. # Spack Project Developers. See the top-level COPYRIGHT file for details.
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
class Opencv(CMakePackage, CudaPackage): 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
@ -151,8 +147,8 @@ class Opencv(CMakePackage, CudaPackage):
# TODO For Cuda >= 10, make sure 'dynlink_nvcuvid.h' or 'nvcuvid.h' # TODO For Cuda >= 10, make sure 'dynlink_nvcuvid.h' or 'nvcuvid.h'
# exists, otherwise build will fail # exists, otherwise build will fail
# See https://github.com/opencv/opencv_contrib/issues/1786 # See https://github.com/opencv/opencv_contrib/issues/1786
conflicts('cuda@10:', when='+cudacodec') conflicts('^cuda@10:', when='+cudacodec')
conflicts('cuda', when='~contrib', msg='cuda support requires +contrib') conflicts('^cuda', when='~contrib', msg='cuda support requires +contrib')
# IPP is provided x86_64 only # IPP is provided x86_64 only
conflicts('+ipp', when="arch=aarch64:") conflicts('+ipp', when="arch=aarch64:")