dartsim: make gz-common geospatial component optional #516
Conversation
Codecov Report
@@ Coverage Diff @@
## gz-physics6 #516 +/- ##
===============================================
- Coverage 76.18% 75.49% -0.70%
===============================================
Files 142 140 -2
Lines 7251 7242 -9
===============================================
- Hits 5524 5467 -57
- Misses 1727 1775 +48
|
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
scpeters
force-pushed
the
scpeters/optional_geospatial
branch
from
67d008f to
8ba5edc
Compare
| $<TARGET_FILE:${PROJECT_LIBRARY_TARGET_NAME}-${PHYSICS_ENGINE_NAME}-plugin> | ||
| --gtest_output=xml:${CMAKE_BINARY_DIR}/test_results/${target_name}.xml | ||
| ) | ||
| if(NOT SKIP_${PHYSICS_ENGINE_NAME} AND NOT INTERNAL_SKIP_${PHYSICS_ENGINE_NAME}) |
There was a problem hiding this comment.
Is INTERNAL_SKIP_* part of the public API of gz-cmake? The prefix INTERNAL_ made me think it wasn't, but I'm not sure.
There was a problem hiding this comment.
The INTERNAL_SKIP_* variables are set when dependencies that are REQUIRED_BY a particular component are not found (see GzFindPackage.cmake). It's not documented behavior, so it's brittle to depend on, but I couldn't figure out a better way, other than reproducing all the REQUIRED_BY logic within this file, which would be a pain. I initially tried if(TARGET ${PROJECT_LIBRARY_TARGET_NAME}-${PHYSICS_ENGINE_NAME}-plugin), but that didn't work because the test folder is added by GzConfigureBuild.cmake before the component folders are added and the corresponding targets created. Reversing this order in gz-cmake is possible, but it may cause other problems, and would require a gz-cmake release. Using INTERNAL_SKIP_* seems least bad to me, though it's partly moot if we can't apply a similar change to gz-rendering
|
This isn't needed since osrf/homebrew-simulation#2274 has been resolved. Let me now if you'd like to make this change or just close the PR |
|
I'll close this for now; we can reopen if it becomes a priority |
🦟 Bug fix
Part of osrf/homebrew-simulation#2274.
Summary
There is currently an issue with
gdalon macOS homebrew-core that causes multiple incompatible versions of protobuf to be in the dependency chain of formulae that depend on bothgz-msgs9andgz-common5. This currently has most Garden packages broken on macOS.A temporary workaround is to disable the
gdaldependency from thegz-physics6homebrew formula untilgdalis fixed. Currently, removinggdalfrom the dependency list ofgz-common5will prevent compilation of all gz-physics plugins because thegeospatialcomponent ofgz-common5is listed as required. This pull request changes thegeospatialcomponent ofgz-common5into an optional component.I also noticed a configuration error when
gdalcould not be found and fixed it in ea8c7cb.Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.