conan v2 support of opencv 4.x

conan-io · Dec 21, 2022 · c1dceea · c1dceea
1 parent 1362dcf
commit c1dceea
Show file tree

Hide file tree

Showing 7 changed files with 284 additions and 267 deletions.
diff --git a/recipes/opencv/4.x/CMakeLists.txt b/recipes/opencv/4.x/CMakeLists.txt
diff --git a/recipes/opencv/4.x/conandata.yml b/recipes/opencv/4.x/conandata.yml
@@ -34,33 +34,62 @@ patches:
     - patch_file: "patches/4.5.5-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
-      base_path: "src"
+    - patch_file: "patches/4.5.0-0002-find-ade.patch"
+      patch_description: "Robust discovery & injection of ade"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0003-find-quirc.patch"
+      patch_description: "Robust discovery & injection of quirc"
+      patch_type: "conan"
   "4.5.3":
     - patch_file: "patches/4.5.3-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
-      base_path: "src"
+    - patch_file: "patches/4.5.0-0002-find-ade.patch"
+      patch_description: "Robust discovery & injection of ade"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0003-find-quirc.patch"
+      patch_description: "Robust discovery & injection of quirc"
+      patch_type: "conan"
   "4.5.2":
     - patch_file: "patches/4.1.2-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
-      base_path: "src"
+    - patch_file: "patches/4.5.0-0002-find-ade.patch"
+      patch_description: "Robust discovery & injection of ade"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0003-find-quirc.patch"
+      patch_description: "Robust discovery & injection of quirc"
+      patch_type: "conan"
   "4.5.1":
     - patch_file: "patches/4.1.2-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
-      base_path: "src"
+    - patch_file: "patches/4.5.0-0002-find-ade.patch"
+      patch_description: "Robust discovery & injection of ade"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0003-find-quirc.patch"
+      patch_description: "Robust discovery & injection of quirc"
+      patch_type: "conan"
   "4.5.0":
     - patch_file: "patches/4.1.2-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
-      base_path: "src"
+    - patch_file: "patches/4.5.0-0002-find-ade.patch"
+      patch_description: "Robust discovery & injection of ade"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0003-find-quirc.patch"
+      patch_description: "Robust discovery & injection of quirc"
+      patch_type: "conan"
   "4.1.2":
     - patch_file: "patches/4.1.2-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
-      base_path: "src"
-    - patch_file: "patches/4.1.2-0002-jasper.patch"
+    - patch_file: "patches/4.1.2-0002-find-ade.patch"
+      patch_description: "Robust discovery & injection of ade"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0003-find-quirc.patch"
+      patch_description: "Robust discovery & injection of quirc"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0004-jasper.patch"
       patch_description: "Compatibility with recent jasper versions"
       patch_type: "portability"
-      base_path: "src"