From bd8a186899023b85fb3e8842799f0d11413978a4 Mon Sep 17 00:00:00 2001 From: GIG Date: Mon, 17 Aug 2020 11:59:06 +0300 Subject: [PATCH] Fix disabling JPEG2K --- conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conanfile.py b/conanfile.py index dad9b4e..a9f8375 100644 --- a/conanfile.py +++ b/conanfile.py @@ -325,6 +325,8 @@ def _configure_cmake(self): if self.options.jpeg2000 == "jasper": cmake.definitions['BUILD_JASPER'] = False cmake.definitions['WITH_JASPER'] = True + else: + cmake.definitions['WITH_JASPER'] = False # openjpeg if self.options.jpeg2000 == "openjpeg": @@ -336,6 +338,8 @@ def _configure_cmake(self): cmake.definitions['OPENJPEG_MAJOR_VERSION'] = 2 cmake.definitions['OPENJPEG_MINOR_VERSION'] = 3 cmake.definitions['OPENJPEG_BUILD_VERSION'] = 1 + else: + cmake.definitions['WITH_OPENJPEG'] = False # JPEG cmake.definitions['BUILD_JPEG'] = False