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.

Sign up for GitHub

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

aruco: add v3.1.15, bump opencv, add transitive_libs=True #21927

Merged
merged 6 commits into from
Oct 21, 2024
Merged

aruco: add v3.1.15, bump opencv, add transitive_libs=True #21927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e67e327
aruco: add v3.1.15, bump opencv
valgur Dec 26, 2023
2223b03
aruco: set transitive_*=True
valgur Dec 26, 2023
ee1a9c4
Merge remote-tracking branch 'upstream/master' into update/aruco
valgur Mar 27, 2024
d9e2008
aruco: bump opencv
valgur Mar 27, 2024
cb4f312
Minor changes
AbrilRBS Oct 21, 2024
d6a4f5c
Prefer cmake_additional_variables_prefixes
AbrilRBS Oct 21, 2024
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/aruco/3.x.x/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"3.1.15":
url: "https://downloads.sourceforge.net/project/aruco/3.1.15/3.1.15.zip"
sha256: "8408ad1621b92c885b0740641ab98ec022705d48a08deb6f071ffebf455cc8b2"
"3.1.12":
url: "https://downloads.sourceforge.net/project/aruco/3.1.12/aruco-3.1.12.zip"
sha256: "70b9ec8aa8eac6fe3f622201747a3e32c77bbb5f015e28a95c1c7c91f8ee8a09"
10 changes: 7 additions & 3 deletions recipes/aruco/3.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from conan import ConanFile
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.files import collect_libs, copy, get, rmdir
from conan.tools.files import collect_libs, copy, get, rmdir, replace_in_file
import os

required_conan_version = ">=1.53.0"
Expand Down Expand Up @@ -37,8 +37,11 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("opencv/4.5.5")
self.requires("eigen/3.4.0")
# Header used in public markerdetector.h
# cv::FileStorage::FileStorage used by aruco::CameraParameters::saveToFile
self.requires("opencv/4.9.0", transitive_headers=True, transitive_libs=True)
# Header used in levmarq.h
self.requires("eigen/3.4.0", transitive_headers=False)

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand All @@ -55,6 +58,7 @@ def generate(self):
tc.variables["USE_OWN_EIGEN3"] = False
tc.generate()
deps = CMakeDeps(self)
deps.set_property("eigen", "cmake_additional_variables_prefixes", ["Eigen3"])
deps.generate()

def build(self):
Expand Down
6 changes: 3 additions & 3 deletions recipes/aruco/3.x.x/test_package/test_package.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <iostream>
#include <vector>
#include <aruco/aruco.h>

#include <opencv2/core.hpp>
#include <opencv2/highgui.hpp>

#include <aruco/aruco.h>
#include <iostream>
#include <vector>

int main() {
cv::Mat image = cv::Mat::zeros(600,600,CV_8UC3);
Expand Down
2 changes: 2 additions & 0 deletions recipes/aruco/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"3.1.15":
folder: 3.x.x
"3.1.12":
folder: 3.x.x