Merge sdf10 -> sdf11 #808
Merged
Merge sdf10 -> sdf11 #808
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This replaces most of the custom cmake code in libsdformat with the functionality provided by ignition-cmake2. The root CMakeLists.txt is much shorter now and most of the cmake folder has been deleted. This is made possible by the NO_IGNITION_PREFIX and REPLACE_IGNITION_INCLUDE_PATH parameters added to ign_configure_project in ign-cmake#190 and ign-cmake#191. Closes gazebosim#181. Other details: * Use FindIgnURDFDOM from ign-cmake#193 * Use HIDE_SYMBOLS_BY_DEFAULT from ign-cmake#196 * Set LEGACY_PROJECT_PREFIX from ign-cmake#199 Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
The USE_INTERNAL_URDF logic for include and windows compiler definitions needs to be repeated for tests that add parser_urdf.cc via target_sources. An interface library is used to deduplicate the cmake logic. Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
to scpeters/sdformat
that referenced
this pull request
Dec 29, 2021
Restore functionality of gazebosim#394. Submitted a fix upstream in gazebosim/gz-cmake#203. Signed-off-by: Steve Peters <[email protected]>
|
I resolved one extra merge conflict in 40b54f0, which is an attempt to retain the functionality for compiling static libraries contributed in #394 by @joxoby with reviews from @traversaro and @madebr. I've also submitted gazebosim/gz-cmake#203 to add this functionality to ign-cmake. Update: I have reverted this commit since it sounds like it is not needed |
8 tasks
scpeters
added a commit
to scpeters/sdformat
that referenced
this pull request
Dec 29, 2021
Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
to scpeters/sdformat
that referenced
this pull request
Dec 29, 2021
Restore functionality of gazebosim#394. Submitted a fix upstream in gazebosim/gz-cmake#203. Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
to scpeters/sdformat
that referenced
this pull request
Dec 29, 2021
Signed-off-by: Steve Peters <[email protected]>
scpeters
force-pushed
the
merge_10_11
branch
from
4abb38c to
34cf35a
Compare
7 tasks
Signed-off-by: Steve Peters <[email protected]>
scpeters
force-pushed
the
merge_10_11
branch
from
34cf35a to
f03ec70
Compare
Codecov Report
@@ Coverage Diff @@
## sdf11 #808 +/- ##
==========================================
- Coverage 88.89% 88.89% -0.01%
==========================================
Files 73 73
Lines 11072 11070 -2
==========================================
- Hits 9843 9841 -2
Misses 1229 1229
Continue to review full report at Codecov.
|
ahcorde
approved these changes
Dec 30, 2021
scpeters
added a commit
to scpeters/sdformat
that referenced
this pull request
Mar 21, 2022
Fixes a mistake from merging forward in gazebosim#808. Signed-off-by: Steve Peters <[email protected]>
7 tasks
scpeters
added a commit
to scpeters/sdformat
that referenced
this pull request
Mar 21, 2022
Fixes a mistake from merging forward in gazebosim#808. Signed-off-by: Steve Peters <[email protected]>
7 tasks
scpeters
added a commit
that referenced
this pull request
Mar 21, 2022
Fixes a mistake from merging forward in #808. Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
that referenced
this pull request
Mar 21, 2022
* Install sdf/1.8 to versioned path * Install sdf/1.9 to a versioned path. Fixes a mistake from merging forward in #808 and #810. Signed-off-by: Steve Peters <[email protected]>
|
This pull request has been mentioned on Gazebo Community. There might be relevant details there: https://community.gazebosim.org/t/new-ignition-releases-2022-03-25-fortress-edifice-citadel/1343/1 |
|
This pull request has been mentioned on Gazebo Community. There might be relevant details there: https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port
sdf10tosdf11. There were some conflicts that I resolved in 4ea05ef while merging:Branch comparison: sdf11...sdf10
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)