Merge sdf12 -> main #813
Merged
Merge sdf12 -> main #813
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
Signed-off-by: Ian Chen <[email protected]>
* Fix cmake warning about newlines * Find python3 in cmake, fix warning (gazebosim#328) Signed-off-by: Steve Peters <[email protected]>
Merge 6 -> 9
Adds a sentence to the behavior of //model/static to avoid confusion on what might happen if it is used within a model that is itself included in another model. Also adds some clarification to //model/@canonical_link. Signed-off-by: FirefoxMetzger <[email protected]> Signed-off-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
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]>
Account for new behavior of nested models and :: syntax. Signed-off-by: Steve Peters <[email protected]>
Merge part of 10 to 11
Signed-off-by: Steve Peters <[email protected]>
Merge sdf10 -> sdf11
Signed-off-by: Steve Peters <[email protected]>
Merge sdf11 to sdf12
Signed-off-by: Louise Poubel <[email protected]> * Add line with unrecognized type Signed-off-by: Steve Peters <[email protected]> * Fix for custom element with attribute 'type' (gazebosim#811) * Reverted changes to parser for custom element with attribute 'type', added fix in ParamPrivate::ValueFromStringImpl instead Signed-off-by: Aaron Chong <[email protected]> Co-authored-by: Steve Peters <[email protected]> Co-authored-by: Aaron Chong <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #813 +/- ##
==========================================
- Coverage 90.69% 90.69% -0.01%
==========================================
Files 78 78
Lines 12440 12433 -7
==========================================
- Hits 11283 11276 -7
Misses 1157 1157
Continue to review full report at Codecov.
|
ahcorde
approved these changes
Jan 3, 2022
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
sdf12tomainBranch comparison: main...sdf12
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)