-
Notifications
You must be signed in to change notification settings - Fork 6.2k
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
[rtabmap] Fix platform and linkage support #37651
Conversation
Ouch. vtk breaking vcpkg CMAKE_PREFIX_PATH for debug configurations. (Because of vcpkg moving cmake config.) |
That seems to be 95052b8 what I fixed in the 5.12 PR |
The vtk patch is part of #37119. |
# Issue that qhull dependency uses optimized and debug keywords, | ||
# which are converted to \$<\$<NOT:\$<CONFIG:DEBUG>> and \$<\$<CONFIG:DEBUG> | ||
# in RTABMap_coreTargets.cmake (not sure why?!). | ||
-list(REMOVE_ITEM PCL_LIBRARIES "debug" "optimized") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This caused harmful mixing of release libs and debug libs.
In local testing of the |
-DWITH_PYTHON_THREADING=OFF | ||
-DWITH_PDAL=OFF | ||
-DRTABMAP_QT_VERSION=6 | ||
"-DRTABMAP_RES_TOOL=${CURRENT_HOST_INSTALLED_DIR}/tools/rtabmap-res-tool/rtabmap-res_tool${VCPKG_TARGET_EXECUTABLE_SUFFIX}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review, no change requested. This is a sort of the options list. These are the actual changes.
-DRTABMAP_QT_VERSION=6
added"-DRTABMAP_RES_TOOL=...
added-DWITH_ORB_OCTREE=ON
gained a comment,# GPLv3
-DWITH_ORB_SLAM=OFF
added
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That last one doesn't appear to be an actual change as it's the default, but this list tries to list all options https://github.com/introlab/rtabmap/blob/11adbdcc9f4edcf047e2f0c147ea6f888d780074/CMakeLists.txt#L214
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the fixes!
-DWITH_PYTHON_THREADING=OFF | ||
-DWITH_PDAL=OFF | ||
-DRTABMAP_QT_VERSION=6 | ||
"-DRTABMAP_RES_TOOL=${CURRENT_HOST_INSTALLED_DIR}/tools/rtabmap-res-tool/rtabmap-res_tool${VCPKG_TARGET_EXECUTABLE_SUFFIX}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That last one doesn't appear to be an actual change as it's the default, but this list tries to list all options https://github.com/introlab/rtabmap/blob/11adbdcc9f4edcf047e2f0c147ea6f888d780074/CMakeLists.txt#L214
rtabmap-res_tool
is moved to a separate port because it is a host dependency, and actual dependencies ofrtabmap
are heavy and non opt-out. Only minimal patching needed.CC @matlabbe.