Add cctag/1.0.3

conan-io · Jul 19, 2023 · e6edea8 · e6edea8
1 parent e2a3544
commit e6edea8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/recipes/cctag/all/conandata.yml b/recipes/cctag/all/conandata.yml
@@ -1,8 +1,15 @@
 sources:
+  "1.0.3":
+    url: "https://github.com/alicevision/CCTag/archive/refs/tags/v1.0.3.tar.gz"
+    sha256: "25396b03c4aa3c1be241a2a8518a29511cb4fff695caa5126203fbba8e8e444d"
   "1.0.1":
     url: "https://github.com/alicevision/CCTag/archive/refs/tags/v1.0.1.tar.gz"
     sha256: "ae8a819bc978eb13bb1061a204c214da835e56c9b7dc775237ed6b2191011dec"
 patches:
+  "1.0.3":
+    - patch_file: "patches/0001-Ignore-TBB-version.patch"
+      patch_description: "Ignore TBB version in find_package to consume one from conan"
+      patch_type: "conan"
   "1.0.1":
     - patch_file: "patches/0001-honor-vc-runtime.patch"
       patch_description: "Honor vc runtime"

diff --git a/recipes/cctag/all/conanfile.py b/recipes/cctag/all/conanfile.py
@@ -4,6 +4,7 @@
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file, rmdir
 from conan.tools.microsoft import is_msvc_static_runtime
+from conan.tools.scm import Version
 import os
 
 required_conan_version = ">=1.53.0"
@@ -51,10 +52,14 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("boost/1.80.0")
+        self.requires("boost/1.82.0")
         self.requires("eigen/3.4.0")
-        self.requires("onetbb/2020.3")
+        if Version(self.version) < "1.0.3":
+            self.requires("onetbb/2020.3")
+        else:
+            self.requires("onetbb/2021.6.0")
         self.requires("opencv/4.5.5")
+        self.requires("libwebp/1.3.1", override=True)
 
     @property
     def _required_boost_components(self):

diff --git a/recipes/cctag/all/patches/0001-Ignore-TBB-version.patch b/recipes/cctag/all/patches/0001-Ignore-TBB-version.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -241,7 +241,7 @@ endif()
+ # FIND Intel TBB
+ # With MVSC, CMAKE_BUILD_TYPE will always be None, so TBB_USE_DEBUG_BUILD will always be false.
+ string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" Debug TBB_USE_DEBUG_BUILD)
+-find_package(TBB 2021.5.0 CONFIG REQUIRED)
++find_package(TBB CONFIG REQUIRED)
+ message(STATUS "Found TBB: version ${TBB_VERSION}")
+
+ add_subdirectory(src)
+
diff --git a/recipes/cctag/config.yml b/recipes/cctag/config.yml
@@ -1,3 +1,5 @@
 versions:
+  "1.0.3":
+    folder: all
   "1.0.1":
     folder: all