File tree Expand file tree Collapse file tree 5 files changed +15
-9
lines changed Expand file tree Collapse file tree 5 files changed +15
-9
lines changed Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ add_subdirectory(urdf_parser)
67
67
68
68
set (PKG_NAME ${PROJECT_NAME} )
69
69
set (PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world )
70
- set (PKG_DEPENDS TinyXML2 urdfdom_headers console_bridge )
70
+ set (PKG_DEPENDS urdfdom_headers )
71
71
set (PKG_EXPORTS urdfdom )
72
72
set (cmake_conf_file "cmake/urdfdom-config" )
73
73
include (CMakePackageConfigHelpers )
@@ -86,16 +86,11 @@ install(FILES
86
86
DESTINATION ${CMAKE_CONFIG_INSTALL_DIR}
87
87
)
88
88
89
- # Some operating systems (like Ubuntu 22.04) do not provide a default
90
- # way to find TinyXML2. For that reason, this package provides it
91
- install (FILES cmake/FindTinyXML2.cmake
92
- DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} )
93
-
94
89
install (FILES package.xml DESTINATION share/${PROJECT_NAME} )
95
90
96
91
# Make the package config file
97
92
set (PKG_DESC "Unified Robot Description Format" )
98
- set (PKG_DEPENDS "tinyxml2 urdfdom_headers console_bridge " ) # make the list separated by spaces instead of ;
93
+ set (PKG_DEPENDS "urdfdom_headers" ) # make the list separated by spaces instead of ;
99
94
set (PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world" )
100
95
set (pkg_conf_file "cmake/pkgconfig/urdfdom.pc" )
101
96
configure_file ("${CMAKE_CURRENT_SOURCE_DIR} /${pkg_conf_file} .in" "${CMAKE_BINARY_DIR} /${pkg_conf_file} " @ONLY )
Original file line number Diff line number Diff line change @@ -10,8 +10,10 @@ macro(add_urdfdom_library)
10
10
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >" )
11
11
target_link_libraries (${add_urdfdom_library_LIBNAME} PUBLIC
12
12
${add_urdfdom_library_LINK}
13
- ${console_bridge_link_libs}
14
13
${urdfdom_headers_link_libs}
14
+ )
15
+ target_link_libraries (${add_urdfdom_library_LIBNAME} PRIVATE
16
+ ${console_bridge_link_libs}
15
17
tinyxml2::tinyxml2
16
18
)
17
19
if (NOT CMAKE_CXX_STANDARD )
Original file line number Diff line number Diff line change 41
41
#include < string>
42
42
#include < vector>
43
43
44
- #include < tinyxml2.h>
45
44
#include < urdf_model/model.h>
46
45
#include < urdf_model/color.h>
47
46
#include < urdf_model/utils.h>
51
50
52
51
#include " exportdecl.h"
53
52
53
+ namespace tinyxml2 {
54
+ // Forward declaration for APIs that use TinyXML2 structures.
55
+ // That way, we don't have to export a TinyXML2 dependency.
56
+ class XMLDocument ;
57
+ class XMLElement ;
58
+ }
59
+
54
60
namespace urdf_export_helpers {
55
61
56
62
URDFDOM_DLLAPI std::string values2str (unsigned int count, const double *values, double (*conv)(double ) = NULL);
Original file line number Diff line number Diff line change 35
35
/* Author: Wim Meeussen */
36
36
37
37
#include " urdf_parser/urdf_parser.h"
38
+
39
+ #include < cstring>
38
40
#include < iostream>
39
41
#include < fstream>
40
42
Original file line number Diff line number Diff line change 40
40
#include < string>
41
41
#include " urdf_parser/urdf_parser.h"
42
42
#include < console_bridge/console.h>
43
+ #include < tinyxml2.h>
43
44
44
45
namespace urdf {
45
46
You can’t perform that action at this time.
0 commit comments