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

0 ➡️ 2 #182

Merged
merged 7 commits into from
Aug 25, 2021
Merged

0 ➡️ 2 #182

merged 7 commits into from
Aug 25, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-cmake0 to ign-cmake2 (ign-cmake1 is EOL)

Branch comparison: ign-cmake2...ign-cmake0

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)


https://github.com/osrf/buildfarmer/issues/224

mxgrey and others added 6 commits November 11, 2019 13:33
Backport fix for find_path cache confusion

Approved-by: Steve Peters <[email protected]>
Approved-by: Nate Koenig <[email protected]>
Approved-by: Louise Poubel <[email protected]>
Signed-off-by: Michael X. Grey <[email protected]>
* Part of gazebo-tooling/release-tools#203
* Disable long-running buildsystem tests by default (#97) (#100)
* backport triage and labeler

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
@github-actions github-actions bot added Gazebo 1️1️ Dependency of Gazebo classic version 11 🏢 edifice Ignition Edifice 🏯 fortress Ignition Fortress 🏰 citadel Ignition Citadel 🔮 dome Ignition Dome labels Aug 24, 2021
@chapulina chapulina changed the title Chapulina/0 to 2 0 ➡️ 2 Aug 24, 2021
cmake/IgnPkgConfig.cmake Outdated Show resolved Hide resolved
Changelog.md Outdated
Comment on lines 9 to 11
1. Fix bad INCLUDE_DIRS cache confusion
* [Pull request #182](https://github.com/ignitionrobotics/ign-cmake/pull/182)
* [Commit 5320ac6](https://github.com/ignitionrobotics/ign-cmake/commit/5320ac64c23e379562f9abfccf5eea69456cb5c1)
Copy link
Contributor

Choose a reason for hiding this comment

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

This was a backport from ign-cmake2, so do we need to add it to the changelog of ign-cmake2 since it's already in ign-cmake2? I'm not sure which particular commit in ign-cmake2 added this because it looks like it was done while we were still on BitBucket, but the content is there if you look at the ign-cmake2 branch

Changelog.md Outdated Show resolved Hide resolved
Signed-off-by: Louise Poubel <[email protected]>
@j-rivero j-rivero merged commit f8ce05a into ign-cmake2 Aug 25, 2021
@j-rivero j-rivero deleted the chapulina/0_to_2 branch August 25, 2021 18:03
@scpeters scpeters mentioned this pull request Sep 1, 2021
6 tasks
srmainwaring pushed a commit to srmainwaring/gz-cmake that referenced this pull request Mar 1, 2022
* make the OGRE plugin path discovery portable (gazebosim#101)
* Remove bitbucket-pipelines.yml (gazebosim#181)

Signed-off-by: Louise Poubel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel 🔮 dome Ignition Dome 🏢 edifice Ignition Edifice 🏯 fortress Ignition Fortress Gazebo 1️1️ Dependency of Gazebo classic version 11
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants