Skip to content

Commit

Permalink
propagate jpeg only if libjpeg-turbo
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceIm committed Dec 19, 2022
1 parent ff32135 commit 7402b5e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions recipes/opencv/3.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,10 @@ def imageformats_deps():
components.append("jasper::jasper")
if self.options.with_png:
components.append("libpng::libpng")
if self.options.with_jpeg:
components.append("{0}::{0}".format(self.options.with_jpeg))
if self.options.with_jpeg == "libjpeg":
components.append("libjpeg::libjpeg")
elif self.options.with_jpeg == "libjpeg-turbo":
components.append("libjpeg-turbo::jpeg")
if self.options.with_tiff:
components.append("libtiff::libtiff")
if self.options.with_openexr:
Expand Down
6 changes: 4 additions & 2 deletions recipes/opencv/4.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,10 @@ def imageformats_deps():
components.append("{0}::{0}".format(self.options.with_jpeg2000))
if self.options.with_png:
components.append("libpng::libpng")
if self.options.with_jpeg:
components.append("{0}::{0}".format(self.options.with_jpeg))
if self.options.with_jpeg == "libjpeg":
components.append("libjpeg::libjpeg")
elif self.options.with_jpeg == "libjpeg-turbo":
components.append("libjpeg-turbo::jpeg")
if self.options.get_safe("with_tiff"):
components.append("libtiff::libtiff")
if self.options.with_openexr:
Expand Down

0 comments on commit 7402b5e

Please sign in to comment.