Skip to content

Remove tinyxml2 and use tinyxml2_vendor #95

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.

Sign up for GitHub

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

Merged
henningkayser merged 3 commits into from
Jun 29, 2021
Merged

Remove tinyxml2 and use tinyxml2_vendor #95

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64fa7b8
Remove tinyxml2 and use tinyxml2_vendor
JafarAbdi Jun 28, 2021
b8cadd7
fix
JafarAbdi Jun 29, 2021
2f7d3dd
Fix
JafarAbdi Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ ament_package_xml()
include_directories(include ${rclcpp_INCLUDE_DIRS}
${rmw_implementation_INCLUDE_DIRS}
${Boost_INCLUDE_DIR}
${TinyXML2_INCLUDE_DIRS}
${urdfdom_headers_INCLUDE_DIRS}
${urdf_INCLUDE_DIRS}
${std_msgs_INCLUDE_DIRS}
Expand All @@ -39,14 +38,12 @@ add_library(${PROJECT_NAME} SHARED
set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION ${${PROJECT_NAME}_VERSION})

# System dependencies
target_link_libraries(${PROJECT_NAME} PUBLIC ${TinyXML2_LIBRARIES})

# Ament dependencies
ament_target_dependencies(${PROJECT_NAME} PUBLIC
TinyXML2
console_bridge
urdfdom_headers
urdf
urdfdom_headers
)

install(TARGETS ${PROJECT_NAME}
Expand Down Expand Up @@ -89,9 +86,10 @@ if(BUILD_TESTING)
endif()

ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME} ${TinyXML2_LIBRARIES})
ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(console_bridge)
ament_export_dependencies(urdfdom_headers)
ament_export_dependencies(urdf)
ament_export_dependencies(tinyxml2_vendor)
ament_export_dependencies(TinyXML2)
ament_package()