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

Jump to bottom

highfive: add v2.5.1 and v2.6.2 #13988

Merged
merged 5 commits into from
Nov 25, 2022
Merged

highfive: add v2.5.1 and v2.6.2 #13988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8a3d49
Bump version
robomics Nov 3, 2022
19a2d6f
Add v2.5.1 and v2.6.1
robomics Nov 11, 2022
57db1f6
Change highfive.witn_opencv to be False by default
robomics Nov 18, 2022
87a55b8
Add v2.6.2
robomics Nov 23, 2022
1fd9b4a
Fix incorrect hash
robomics Nov 23, 2022
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
6 changes: 6 additions & 0 deletions recipes/highfive/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
sources:
"2.6.2":
url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.6.2.tar.gz"
sha256: "ab51b9fbb49e877dd1aa7b53b4b26875f41e4e0b8ee0fc2f1d735e0d1e43d708"
"2.5.1":
url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.5.1.tar.gz"
sha256: "1ba05aa31cdeda03d013094eebc10f932783e4e071e253e9eaa8889120f241c7"
"2.4.1":
url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.4.1.tar.gz"
sha256: "6826471ef5c645ebf947d29574b302991525a8a8ff1ef687aba7311d9a0ea36f"
Expand Down
2 changes: 1 addition & 1 deletion recipes/highfive/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class HighFiveConan(ConanFile):
"with_boost": True,
"with_eigen": True,
"with_xtensor": True,
"with_opencv": True,
"with_opencv": False,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was holding off since we usually dont change these but this matches upstream https://github.com/BlueBrain/HighFive/blob/577a2552357ddd9ba9ed412452ea5406747033b4/CMakeLists.txt#L23

So it's acceptable to me

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into the opencv/jaspar deps issue.
I can submit another PR once #13159 is solved to set with_opencv back to True.

}

def layout(self):
Expand Down
4 changes: 4 additions & 0 deletions recipes/highfive/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
versions:
"2.6.2":
folder: all
"2.5.1":
folder: all
"2.4.1":
folder: all
"2.3.1":
Expand Down