Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cctag/1.0.3 #18631

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/cctag/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
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"
Expand Down
21 changes: 15 additions & 6 deletions recipes/cctag/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
from conan.tools.build import check_min_cppstd
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.microsoft import is_msvc_static_runtime, is_msvc
from conan.tools.scm import Version
import os

required_conan_version = ">=1.53.0"
Expand Down Expand Up @@ -51,10 +52,18 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("boost/1.80.0")
self.requires("eigen/3.4.0")
self.requires("onetbb/2020.3")
self.requires("opencv/4.5.5")
# self.requires("boost/1.82.0")
#
# With boost 1.80.0 build failed with error like:
# CMakeFiles/CCTag.dir/cctag/Multiresolution.cpp.o:(.bss+0x4): multiple definition of `boost::phoenix::placeholders::uarg8'; CMakeFiles/CCTag.dir/cctag/Bresenham.cpp.o:(.bss+0x4): first defined here
self.requires("eigen/3.4.0", transitive_headers=True)
self.requires("opencv/4.5.5", transitive_headers=True)
if Version(self.version) < "1.0.3":
self.requires("boost/1.80.0")
self.requires("onetbb/2020.3")
else:
self.requires("boost/1.71.0")
self.requires("onetbb/2021.6.0")

@property
def _required_boost_components(self):
Expand All @@ -74,7 +83,7 @@ def validate(self):
f"{', '.join(self._required_boost_components)}",
)

if self.settings.compiler == "Visual Studio" and not self.options.shared and \
if is_msvc(self) and not self.options.shared and \
is_msvc_static_runtime(self) and self.dependencies["onetbb"].options.shared:
raise ConanInvalidConfiguration("this specific configuration is prevented due to internal c3i limitations")

Expand Down
2 changes: 2 additions & 0 deletions recipes/cctag/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"1.0.3":
folder: all
"1.0.1":
folder: all