Skip to content

Commit

Permalink
Fix double del when setting dnn option to False
Browse files Browse the repository at this point in the history
If opnecv is built with both dnn and with_cuda False, the build fails, because the conanfile.py execute 
del self.options.dnn_cuda twice. 
This fixes the issue.
  • Loading branch information
Corallo committed May 8, 2023
1 parent 227d682 commit 89e9020
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions recipes/opencv/4.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,12 @@ def configure(self):
if not self.options.contrib:
del self.options.contrib_freetype
del self.options.contrib_sfm
if not self.options.dnn:
if not self.options.dnn or not self.options.with_cuda:
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 bool(self.options.with_jpeg):
if self.options.get_safe("with_jpeg2000") == "jasper":
Expand Down

0 comments on commit 89e9020

Please sign in to comment.