diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index 3d8a3a3c..2c241902 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -4,8 +4,6 @@ project(urdf) find_package(ament_cmake_ros REQUIRED) find_package(urdfdom REQUIRED) find_package(urdfdom_headers REQUIRED) -find_package(tinyxml_vendor REQUIRED) -find_package(TinyXML REQUIRED) # Find version components if(NOT urdfdom_headers_VERSION) @@ -35,7 +33,7 @@ target_include_directories(${PROJECT_NAME} ament_target_dependencies(${PROJECT_NAME} urdfdom urdfdom_headers - TinyXML) +) if(WIN32) target_compile_definitions(${PROJECT_NAME} PRIVATE "URDF_BUILDING_DLL") @@ -70,8 +68,6 @@ endif() ament_export_libraries(${PROJECT_NAME}) ament_export_targets(${PROJECT_NAME}) ament_export_include_directories(include) -ament_export_dependencies(tinyxml_vendor) -ament_export_dependencies(TinyXML) ament_export_dependencies(urdfdom) ament_export_dependencies(urdfdom_headers) ament_package() diff --git a/urdf/include/urdf/model.h b/urdf/include/urdf/model.h index a81baa28..8ea1c2d6 100644 --- a/urdf/include/urdf/model.h +++ b/urdf/include/urdf/model.h @@ -39,7 +39,6 @@ #include -#include "tinyxml.h" // NOLINT #include "urdf_model/model.h" #include "urdf/urdfdom_compatibility.h" @@ -51,10 +50,6 @@ namespace urdf class Model : public ModelInterface { public: - /// \brief Load Model from TiXMLElement - URDF_EXPORT bool initXml(TiXmlElement * xml); - /// \brief Load Model from TiXMLDocument - URDF_EXPORT bool initXml(TiXmlDocument * xml); /// \brief Load Model given a filename URDF_EXPORT bool initFile(const std::string & filename); /// \brief Load Model given the name of a parameter on the parameter server diff --git a/urdf/mainpage.dox b/urdf/mainpage.dox index 9287a452..89d611de 100644 --- a/urdf/mainpage.dox +++ b/urdf/mainpage.dox @@ -58,7 +58,6 @@ The connection between links(nodes) and joints(edges) should define a tree (i.e. \section codeapi Code API The URDF parser API contains the following methods: - \li Parse and build tree from XML: urdf::Model::initXml \li Parse and build tree from File: urdf::Model::initFile \li Parse and build tree from String: urdf::Model::initString \li Get Root Link: urdf::Model::getRoot diff --git a/urdf/package.xml b/urdf/package.xml index 174c8653..21a5cde7 100644 --- a/urdf/package.xml +++ b/urdf/package.xml @@ -21,19 +21,14 @@ ament_cmake_ros - tinyxml - tinyxml_vendor urdfdom urdfdom_headers - tinyxml - tinyxml_vendor urdfdom urdfdom_headers - tinyxml urdfdom_headers diff --git a/urdf/src/model.cpp b/urdf/src/model.cpp index 29311424..233af383 100644 --- a/urdf/src/model.cpp +++ b/urdf/src/model.cpp @@ -98,32 +98,6 @@ bool Model::initParamWithNodeHandle(const std::string & param, const ros::NodeHa } */ -bool Model::initXml(TiXmlDocument * xml_doc) -{ - if (!xml_doc) { - fprintf(stderr, "Could not parse the xml document.\n"); - return false; - } - - std::stringstream ss; - ss << *xml_doc; - - return Model::initString(ss.str()); -} - -bool Model::initXml(TiXmlElement * robot_xml) -{ - if (!robot_xml) { - fprintf(stderr, "Could not parse the xml element.\n"); - return false; - } - - std::stringstream ss; - ss << (*robot_xml); - - return Model::initString(ss.str()); -} - bool Model::initString(const std::string & xml_string) { urdf::ModelInterfaceSharedPtr model;