Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opencv 4.x fix double del dnn_cuda option #16587

Closed
wants to merge 8 commits into from
Closed

opencv 4.x fix double del dnn_cuda option #16587

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e97f93d
opencv 4.x fix double del dnn_cuda option
Mar 16, 2023
36d912c
Merge branch 'conan-io:master' into opencv-fix-double-del-option
nicosmd Mar 23, 2023
a3568ab
bump libwep to 1.3.0
Mar 23, 2023
72b514e
Merge branch 'master' into opencv-fix-double-del-option
nicosmd Mar 24, 2023
3221c29
Merge branch 'master' into opencv-fix-double-del-option
nicosmd Mar 27, 2023
69491a4
Merge branch 'master' into opencv-fix-double-del-option
memsharded May 30, 2023
0712c30
Merge branch 'master' into opencv-fix-double-del-option
memsharded May 30, 2023
44a8365
Merge branch 'master' into opencv-fix-double-del-option
nicosmd Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions recipes/opencv/4.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,13 @@ def configure(self):
if not self.options.contrib:
del self.options.contrib_freetype
del self.options.contrib_sfm
if not self.options.dnn:
del self.options.dnn_cuda
if not self.options.with_cuda:
del self.options.with_cublas
del self.options.with_cudnn
del self.options.with_cufft
del self.options.dnn_cuda
del self.options.cuda_arch_bin
if not self.options.dnn or not self.options.with_cuda:
del self.options.dnn_cuda
if bool(self.options.with_jpeg):
if self.options.get_safe("with_jpeg2000") == "jasper":
self.options["jasper"].with_libjpeg = self.options.with_jpeg
Expand Down