Skip to content

Commit b0f1f4f

Browse files
committed
fix(autoware_cmake): remove workaround, fixed in ros2/tinyxml2_vendor#23
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent 0e0794e commit b0f1f4f

1 file changed

Lines changed: 0 additions & 16 deletions

File tree

autoware_cmake/cmake/autoware_package.cmake

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,6 @@ macro(autoware_package)
5555
# Find dependencies
5656
find_package(ament_cmake_auto REQUIRED)
5757

58-
# TODO(youtalk): Remove this workaround once https://github.com/autowarefoundation/autoware_universe/issues/10410 is fixed
59-
find_package(TinyXML2 CONFIG QUIET)
60-
if(NOT TinyXML2_FOUND)
61-
find_path(TINYXML2_INCLUDE_DIR NAMES tinyxml2.h)
62-
find_library(TINYXML2_LIBRARY tinyxml2)
63-
include(FindPackageHandleStandardArgs)
64-
find_package_handle_standard_args(TinyXML2 DEFAULT_MSG TINYXML2_LIBRARY TINYXML2_INCLUDE_DIR)
65-
mark_as_advanced(TINYXML2_INCLUDE_DIR TINYXML2_LIBRARY)
66-
if(NOT TARGET tinyxml2::tinyxml2)
67-
add_library(tinyxml2::tinyxml2 UNKNOWN IMPORTED)
68-
set_property(TARGET tinyxml2::tinyxml2 PROPERTY IMPORTED_LOCATION ${TINYXML2_LIBRARY})
69-
set_property(TARGET tinyxml2::tinyxml2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${TINYXML2_INCLUDE_DIR})
70-
list(APPEND TinyXML2_TARGETS tinyxml2::tinyxml2)
71-
endif()
72-
endif()
73-
7458
ament_auto_find_build_dependencies()
7559

7660
# Set common system includes

0 commit comments

Comments
 (0)