Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## ros2 #282 +/- ##
==========================================
- Coverage 19.86% 13.29% -6.57%
==========================================
Files 5 12 +7
Lines 1858 2302 +444
Branches 0 131 +131
==========================================
- Hits 369 306 -63
- Misses 1489 1986 +497
- Partials 0 10 +10 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
327346d to
34b8e91
Compare
d4bb430 to
63a9621
Compare
c1877f5 to
847184c
Compare
|
Close #288 |
|
@tylerjw ping |
|
@nbbrooks ping |
6da8b38 to
388f117
Compare
|
While resolving a conflict I've added a link libraries list pattern to reduce the redundant listing. |
| find_package(QT NAMES Qt6 Qt5 COMPONENTS Test Widgets) | ||
|
|
||
| if(Qt${QT_VERSION_MAJOR} STREQUAL "6") | ||
| find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test Widgets Core5Compat) | ||
| if(${QT_VERSION} VERSION_LESS 5.15.0) | ||
| function(qt_wrap_cpp out) | ||
| qt5_wrap_cpp(_sources ${ARGN}) | ||
| set("${out}" ${_sources} PARENT_SCOPE) | ||
| endfunction() | ||
| endif() | ||
| else()#Qt5 | ||
| find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test Widgets) | ||
| endif() |
There was a problem hiding this comment.
| find_package(QT NAMES Qt6 Qt5 COMPONENTS Test Widgets) | |
| if(Qt${QT_VERSION_MAJOR} STREQUAL "6") | |
| find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test Widgets Core5Compat) | |
| if(${QT_VERSION} VERSION_LESS 5.15.0) | |
| function(qt_wrap_cpp out) | |
| qt5_wrap_cpp(_sources ${ARGN}) | |
| set("${out}" ${_sources} PARENT_SCOPE) | |
| endfunction() | |
| endif() | |
| else()#Qt5 | |
| find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test Widgets) | |
| endif() | |
| find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Test Widgets) | |
| find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) | |
| if(${QT_VERSION} VERSION_LESS 5.15.0) | |
| function(qt_wrap_cpp out) | |
| qt5_wrap_cpp(_sources ${ARGN}) | |
| set("${out}" ${_sources} PARENT_SCOPE) | |
| endfunction() | |
| endif() | |
| if(Qt${QT_VERSION_MAJOR} STREQUAL "6") | |
| find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core5Compat) | |
| endif() |
CI problem might be here. if(${QT_VERSION} VERSION_LESS 5.15.0) is inside the if(Qt${QT_VERSION_MAJOR} STREQUAL "6") block.
There was a problem hiding this comment.
Adding the explicit check might just move the failure to find_package time, as we have nothing in package.xml to selectively install stuff like libqt6-core and libqt6core5compat6-dev
I don't know enough about qt5 and qt6 support to know what should get changed there though.
There was a problem hiding this comment.
Nevermind about the explciit check, I do see it is in find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test Widgets Core5Compat) already
There was a problem hiding this comment.
But it is inside the incorrect if(Qt${QT_VERSION_MAJOR} STREQUAL "6") syntax. OK let's see what my suggested change does. Prob move the error to find_package time. And then we may need to figure out how to support selective package.xml dependencies based on ROS version (a topic that came up in the December community meeting)
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
|
In ROS 1 branch this followed the Qt version exported by RViz, is this no longer available here? |
fix compile with Qt6