Consolidate handling webp, openjpeg options

Author: theirix

recipes/leptonica/all/conanfile.py

@@ -164,28 +164,35 @@ def _patch_sources(self):
         ## We have to be more aggressive with dependencies found with pkgconfig
         ## Injection of libdirs is ensured by conan_basic_setup()
         ## openjpeg
-        replace_in_file(self, cmakelists, "if(NOT JP2K)", "if(0)")
+        if Version(self.version) < "1.83.0":
+            # versions below 1.83.0 do not have an option toggle
+            replace_in_file(self, cmakelists, "if(NOT JP2K)", "if(0)")
+            if not self.options.with_openjpeg:
+                replace_in_file(self, cmakelists_src, "if (JP2K_FOUND)", "if(0)")
+                replace_in_file(self, cmake_configure, "if (JP2K_FOUND)", "if(0)")
+        else:
+            replace_in_file(self, cmakelists, "set(JP2K_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIRS})", "set(JP2K_INCLUDE_DIRS ${OpenJPEG_INCLUDE_DIRS})")
+
         replace_in_file(self, cmakelists_src,
                               "if (JP2K_FOUND)",
                               "if (JP2K_FOUND)\n"
                               "target_link_directories(leptonica PRIVATE ${JP2K_LIBRARY_DIRS})\n"
                               "target_compile_definitions(leptonica PRIVATE ${JP2K_CFLAGS_OTHER})")
-        if not self.options.with_openjpeg:
-            replace_in_file(self, cmakelists_src, "if (JP2K_FOUND)", "if(0)")
-            replace_in_file(self, cmake_configure, "if (JP2K_FOUND)", "if(0)")
         ## libwebp
-        replace_in_file(self, cmakelists, "if(NOT WEBP)", "if(0)")
+        if Version(self.version) < "1.83.0":
+            # versions below 1.83.0 do not have an option toggle
+            replace_in_file(self, cmakelists, "if(NOT WEBP)", "if(0)")
+            if Version(self.version) >= "1.79.0":
+                replace_in_file(self, cmakelists, "if(NOT WEBPMUX)", "if(0)")
+            if not self.options.with_webp:
+                replace_in_file(self, cmakelists_src, "if (WEBP_FOUND)", "if(0)")
+                replace_in_file(self, cmake_configure, "if (WEBP_FOUND)", "if(0)")
         replace_in_file(self, cmakelists_src,
                               "if (WEBP_FOUND)",
                               "if (WEBP_FOUND)\n"
                               "target_link_directories(leptonica PRIVATE ${WEBP_LIBRARY_DIRS} ${WEBPMUX_LIBRARY_DIRS})\n"
                               "target_compile_definitions(leptonica PRIVATE ${WEBP_CFLAGS_OTHER} ${WEBPMUX_CFLAGS_OTHER})")
         replace_in_file(self, cmakelists_src, "${WEBP_LIBRARIES}", "${WEBP_LIBRARIES} ${WEBPMUX_LIBRARIES}")
-        if Version(self.version) >= "1.79.0":
-            replace_in_file(self, cmakelists, "if(NOT WEBPMUX)", "if(0)")
-        if not self.options.with_webp:
-            replace_in_file(self, cmakelists_src, "if (WEBP_FOUND)", "if(0)")
-            replace_in_file(self, cmake_configure, "if (WEBP_FOUND)", "if(0)")
 
         # Remove detection of fmemopen() on macOS < 10.13
         # CheckFunctionExists will find it in the link library.