gdal/post_3.5.0: fix jxl_threads support

conan-io · Aug 21, 2023 · 2b2f0cf · 2b2f0cf
1 parent 3fbffd7
commit 2b2f0cf
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/recipes/gdal/post_3.5.0/conanfile.py b/recipes/gdal/post_3.5.0/conanfile.py
@@ -529,7 +529,8 @@ def generate(self):
             "libdeflate":                 "Deflate::Deflate",
             "libgeotiff":                 "GEOTIFF::GEOTIFF",
             "libheif":                    "HEIF::HEIF",
-            "libjxl":                     "JXL::JXL",
+            "libjxl::jxl":                "JXL::JXL",
+            "libjxl::jxl_threads":        "JXL_THREADS::JXL_THREADS",
             "libjpeg":                    "JPEG::JPEG",
             "libjpeg-turbo::jpeg":        "JPEG::JPEG",
             "librasterlite2":             "RASTERLITE2::RASTERLITE2",
@@ -568,6 +569,9 @@ def _patch_sources(self):
         replace_in_file(self, os.path.join(self.source_folder, "port", "CMakeLists.txt"),
                         "PRIVATE Deflate::Deflate",
                         "PUBLIC Deflate::Deflate")
+        # JXL_THREADS is provided under the JXL package in Conan.
+        replace_in_file(self, os.path.join(self.source_folder, "cmake", "helpers", "CheckDependentLibraries.cmake"),
+                        "JXL_THREADS", "JXL", strict=False)
 
     def build(self):
         self._patch_sources()