Skip to content

v1.7.2 patch to not automatically download results measure#723

Merged
jmarrec merged 13 commits intomasterfrom
v1.7.2-patch
Jul 15, 2024
Merged

v1.7.2 patch to not automatically download results measure#723
jmarrec merged 13 commits intomasterfrom
v1.7.2-patch

Conversation

@macumber
Copy link
Copy Markdown
Collaborator

@macumber macumber commented Jul 13, 2024 •
edited
Loading

Fixes #722 for users of 1.7.x

@macumber macumber changed the base branch from develop to master July 13, 2024 23:48
jmarrec
jmarrec reviewed Jul 15, 2024
View reviewed changes
ConanInstall.cmake
Comment on lines +8 to +9
6abed7382c98a76b447675b30baff6a0b2f5d263041f6eb2fb682b80adaa2555)
set(CMAKE_CONAN_VERSION "b240c809b5ea097077fc8222cad71d2329288e48")
Copy link
Copy Markdown
Collaborator

@jmarrec jmarrec Jul 15, 2024

Choose a reason for hiding this comment

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

what's up with that?

Copy link
Copy Markdown
Collaborator

@jmarrec jmarrec Jul 15, 2024

Choose a reason for hiding this comment

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

I think we want to revert this, so I did.

Copy link
Copy Markdown
Collaborator

@jmarrec jmarrec Jul 15, 2024

Choose a reason for hiding this comment

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

wait, this file is just removed from develop... you're trying to patch 1.7.1, so prior to conan 2, right?

Copy link
Copy Markdown
Collaborator

@jmarrec jmarrec Jul 15, 2024

Choose a reason for hiding this comment

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

Seems this moving back to 0.18.1 conan.cmake fails... so I undid the revert. I don't get why it's needed though

Copy link
Copy Markdown
Collaborator

@jmarrec jmarrec Jul 15, 2024

Choose a reason for hiding this comment

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

@macumber I merged the PR but still interested in knowing why the cmake-conan change

Copy link
Copy Markdown
Collaborator

@jmarrec jmarrec Jul 15, 2024

Choose a reason for hiding this comment

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

Well I guess this is the MSVC version bump: https://github.com/conan-io/cmake-conan/compare/0.18.1..b240c809b5ea097077fc8222cad71d2329288e48#diff-38d3a64722cdcedde80d74c070ddde27605444596c5bcc73cd63a5bdcd1e1258R58

Copy link
Copy Markdown
Collaborator Author

@macumber macumber Jul 15, 2024

Choose a reason for hiding this comment

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

Yeah, sorry, I should have left a better comment. My guess is they made the MSVC version bump on develop but didn't create a release for it because they wanted to focus on conan v2.

@jmarrec jmarrec merged commit 10eb8f7 into master Jul 15, 2024
@jmarrec jmarrec deleted the v1.7.2-patch branch July 15, 2024 13:28
@github-actions github-actions bot locked and limited conversation to collaborators Jul 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jmarrec jmarrec jmarrec approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@macumber @jmarrec