mirror of
https://github.com/moveit/moveit_task_constructor.git
synced 2025-11-04 14:49:57 +08:00
Mandatory yaml dependency
Some checks failed
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[CLANG_TIDY:true IMAGE:noble-ci-testing TARGET_CMAKE_… (push) Has been cancelled
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[DOCKER_RUN_OPTS:-e PRELOAD=libasan.so.8 -e LSAN_OPTI… (push) Has been cancelled
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[IMAGE:jammy-ci]) (push) Has been cancelled
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[IMAGE:noble-ci NAME:ccov TARGET_CMAKE_ARGS:-DCMAKE_B… (push) Has been cancelled
Format / pre-commit (push) Has been cancelled
CI / doc (push) Has been cancelled
CI / deploy (push) Has been cancelled
Some checks failed
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[CLANG_TIDY:true IMAGE:noble-ci-testing TARGET_CMAKE_… (push) Has been cancelled
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[DOCKER_RUN_OPTS:-e PRELOAD=libasan.so.8 -e LSAN_OPTI… (push) Has been cancelled
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[IMAGE:jammy-ci]) (push) Has been cancelled
CI / ${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }} (map[IMAGE:noble-ci NAME:ccov TARGET_CMAKE_ARGS:-DCMAKE_B… (push) Has been cancelled
Format / pre-commit (push) Has been cancelled
CI / doc (push) Has been cancelled
CI / deploy (push) Has been cancelled
This commit is contained in:
parent
1655762a63
commit
377d09046f
@ -2,16 +2,13 @@ set(MOVEIT_LIB_NAME motion_planning_tasks_properties)
|
|||||||
|
|
||||||
set(SOURCES
|
set(SOURCES
|
||||||
property_factory.cpp
|
property_factory.cpp
|
||||||
|
property_from_yaml.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(YAML yaml-0.1)
|
pkg_check_modules(YAML REQUIRED yaml-0.1)
|
||||||
if (YAML_FOUND)
|
# Only cmake > 3.12 provides XXX_LINK_LIBRARIES. Find the absolute path manually
|
||||||
# Only cmake > 3.12 provides XXX_LINK_LIBRARIES. Find the absolute path manually
|
find_library(YAML_LIBRARIES ${YAML_LIBRARIES} PATHS ${YAML_LIBRARY_DIRS})
|
||||||
find_library(YAML_LIBRARIES ${YAML_LIBRARIES} PATHS ${YAML_LIBRARY_DIRS})
|
|
||||||
list(APPEND SOURCES property_from_yaml.cpp)
|
|
||||||
add_definitions(-DHAVE_YAML)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_library(${MOVEIT_LIB_NAME} SHARED ${SOURCES})
|
add_library(${MOVEIT_LIB_NAME} SHARED ${SOURCES})
|
||||||
|
|
||||||
|
|||||||
@ -147,21 +147,4 @@ void PropertyFactory::addRemainingProperties(rviz::Property* root, mtc::Property
|
|||||||
new rviz::Property("no properties", QVariant(), QString(), root);
|
new rviz::Property("no properties", QVariant(), QString(), root);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef HAVE_YAML
|
|
||||||
rviz::Property* PropertyFactory::createDefault(const std::string& name, const std::string& /*type*/,
|
|
||||||
const std::string& description, const std::string& value,
|
|
||||||
rviz::Property* old) {
|
|
||||||
if (old) { // reuse existing Property?
|
|
||||||
assert(old->getNameStd() == name);
|
|
||||||
old->setDescription(QString::fromStdString(description));
|
|
||||||
old->setValue(QString::fromStdString(value));
|
|
||||||
return old;
|
|
||||||
} else { // create new Property?
|
|
||||||
rviz::Property* result = new rviz::StringProperty(QString::fromStdString(name), QString::fromStdString(value),
|
|
||||||
QString::fromStdString(description));
|
|
||||||
result->setReadOnly(true);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
} // namespace moveit_rviz_plugin
|
} // namespace moveit_rviz_plugin
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
<depend>moveit_ros_visualization</depend>
|
<depend>moveit_ros_visualization</depend>
|
||||||
<depend>roscpp</depend>
|
<depend>roscpp</depend>
|
||||||
<depend>rviz</depend>
|
<depend>rviz</depend>
|
||||||
|
<depend>yaml</depend>
|
||||||
|
|
||||||
<test_depend>rosunit</test_depend>
|
<test_depend>rosunit</test_depend>
|
||||||
<test_depend>rostest</test_depend>
|
<test_depend>rostest</test_depend>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user