[urdfdom][sdformat9] Re-fix build #22367
Merged
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
added 2 commits
January 4, 2022 21:04
JackBoosY
added
category:port-bug
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
added 2 commits
January 4, 2022 21:17
|
|
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
added 2 commits
January 4, 2022 23:15
JackBoosY
commented
Jan 5, 2022
Comment on lines
+25
to
+27
| -Durdfdom_headers_VERSION_MAJOR=1 | ||
| -Durdfdom_headers_VERSION_MINOR=0 | ||
| -Durdfdom_headers_VERSION_PATCH=4 |
There was a problem hiding this comment.
In BackwardCompatibility.hpp.in:
/* urdfdom_headers Version number */
// We define the version numbers of urdfdom_headers here since it doesn't expose
// the version numbers itself in source level.
#define URDFDOM_HEADERS_MAJOR_VERSION @urdfdom_headers_VERSION_MAJOR@
#define URDFDOM_HEADERS_MINOR_VERSION @urdfdom_headers_VERSION_MINOR@
#define URDFDOM_HEADERS_PATCH_VERSION @urdfdom_headers_VERSION_PATCH@
#define URDFDOM_HEADERS_VERSION_AT_LEAST(x,y,z) \
(URDFDOM_HEADERS_MAJOR_VERSION > x || (URDFDOM_HEADERS_MAJOR_VERSION >= x && \
(URDFDOM_HEADERS_MINOR_VERSION > y || (URDFDOM_HEADERS_MINOR_VERSION >= y && \
URDFDOM_HEADERS_PATCH_VERSION >= z))))
#if URDFDOM_HEADERS_VERSION_AT_LEAST(1,0,0)
...
PhoebeHui
reviewed
Jan 6, 2022
PhoebeHui
reviewed
Jan 6, 2022
added 2 commits
January 6, 2022 00:35
added 2 commits
January 6, 2022 01:34
JackBoosY
commented
Jan 6, 2022
Comment on lines
+36
to
+53
| +if (0) | ||
| foreach(lib @PKG_LIBRARIES@) | ||
| set(onelib "${lib}-NOTFOUND") | ||
| find_library(onelib ${lib} | ||
| @@ -25,3 +29,13 @@ foreach(dep @PKG_DEPENDS@) | ||
| list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS}) | ||
| list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES}) | ||
| endforeach() | ||
| +endif() | ||
| + | ||
| +include(CMakeFindDependencyMacro) | ||
| +find_dependency(console_bridge) | ||
| + | ||
| +foreach(exp @PKG_EXPORTS@) | ||
| + include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake) | ||
| +endforeach() | ||
| + | ||
| +set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) |
There was a problem hiding this comment.
The old method still have some problems.
I've open an issue about that: ros/urdfdom#166
JackBoosY
commented
Jan 6, 2022
| - DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| -INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| -INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| +INSTALL( |
There was a problem hiding this comment.
The upstrema merged this changes in the latest master.
added 2 commits
January 6, 2022 05:24
PhoebeHui
approved these changes
Jan 7, 2022
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout b934807c799fd84c2e1e168b8d3472d4904a6f90 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json
index 166ffd0..3de7f0f 100644
--- a/versions/s-/sdformat9.json
+++ b/versions/s-/sdformat9.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "3f02b6228c284f5597009f5c0a4832aba019830e",
+ "git-tree": "8873210007b7610df26590b00c6f61204b08210a",
"version": "9.4.0",
"port-version": 3
},
strega-nil-ms
force-pushed
the
dev/jack/refix-urdfdom-sdformat9
branch
from
4653dfe
to
f5ea9fa
Compare
rhuijben
pushed a commit
to rhuijben/vcpkg
that referenced
this pull request
Jan 25, 2022
* [urdfdom][sdformat9] Re-fix build * version * Remove empty folder * version * [dartsim] Fix build issue * version * Update version name * version * Apply suggestions * version * Add PKG_EXPORTS * version * Update ports/sdformat9/fix-dependency-urdfdom.patch Co-authored-by: nicole mazzuca <[email protected]>
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.
Refix sdformat9 build issue:
Related: #21456.
Sorry, I didn't completely fix this in #22180.