Skip to content

Commit bdcbd2e

Browse files
authored
link against tinyxml2 correctly (#190)
* link against tinyxml2 correctly * remove tinyxml2_vendor library * use ament target dependencies for TinyXML2 Signed-off-by: Karsten Knese <karsten@openrobotics.org>
1 parent 306f6ca commit bdcbd2e

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

pluginlib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ add_library(${PROJECT_NAME} INTERFACE)
2222
target_include_directories(${PROJECT_NAME} INTERFACE
2323
"$<INSTALL_INTERFACE:include>")
2424
ament_target_dependencies(${PROJECT_NAME} INTERFACE
25-
ament_index_cpp class_loader rcutils rcpputils tinyxml2_vendor TinyXML2)
25+
ament_index_cpp class_loader rcutils rcpputils TinyXML2)
2626
ament_export_dependencies(ament_index_cpp class_loader rcutils rcpputils tinyxml2_vendor TinyXML2)
2727
ament_export_include_directories(include)
2828
ament_export_targets(${PROJECT_NAME})

pluginlib/pluginlib-extras.cmake

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,3 @@ if(UNIX AND NOT APPLE)
4040
# ament_export_libraries() because it is not absolute and cannot be found with find_library
4141
list(APPEND pluginlib_LIBRARIES ${FILESYSTEM_LIB})
4242
endif()
43-
44-
find_package(tinyxml2_vendor REQUIRED)
45-
find_package(TinyXML2 REQUIRED)
46-
list(APPEND pluginlib_LIBRARIES ${TinyXML2_LIBRARIES})
47-
48-
add_library(tinyxml2_vendor INTERFACE IMPORTED)
49-
target_include_directories(tinyxml2_vendor INTERFACE
50-
${TinyXML2_INCLUDE_DIRS})
51-
target_link_libraries(tinyxml2_vendor INTERFACE
52-
${TinyXML2_LIBRARIES})
53-
list(APPEND pluginlib_TARGETS tinyxml2_vendor)

0 commit comments

Comments
 (0)