Skip to content

Commit db00020

Browse files
vish0012github-actions
andauthored
feat(autoware_cmake): support USE_SCOPED_HEADER_INSTALL_DIR in autoware_ament_auto_package (#40)
* feat(autoware_cmake): support USE_SCOPED_HEADER_INSTALL_DIR in autoware_ament_auto_package * Removed the FILES_MATCHING patterns from both install calls Removed unnecessary FILES_MATCHING patterns from install commands. --------- Co-authored-by: github-actions <github-actions@github.com>
1 parent 0e0794e commit db00020

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

autoware_cmake/cmake/autoware_ament_auto_package.cmake

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
macro(autoware_ament_auto_package)
1616
# cSpell:ignore ARGN
1717
cmake_parse_arguments(_ARG_AUTOWARE_AMENT_AUTO_PACKAGE
18-
"INSTALL_TO_PATH"
18+
"INSTALL_TO_PATH;USE_SCOPED_HEADER_INSTALL_DIR"
1919
""
2020
"INSTALL_TO_SHARE"
2121
${ARGN})
@@ -33,18 +33,19 @@ macro(autoware_ament_auto_package)
3333
endif()
3434
endforeach()
3535

36-
# Export and install include directory maintaining Autoware structure
37-
# Always use "include" as destination (not "include/${PROJECT_NAME}")
38-
# to maintain Autoware's naming convention across all ROS 2 versions
36+
# Export and install include directory.
37+
# When USE_SCOPED_HEADER_INSTALL_DIR is enabled, headers are installed under
38+
# include/${PROJECT_NAME}. Otherwise, headers are installed under include.
3939
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include")
40-
ament_export_include_directories("include")
41-
install(DIRECTORY include/ DESTINATION include
42-
FILES_MATCHING
43-
PATTERN "*.h"
44-
PATTERN "*.hpp"
45-
PATTERN "*.hh"
46-
PATTERN "*.hxx"
47-
)
40+
if(_ARG_AUTOWARE_AMENT_AUTO_PACKAGE_USE_SCOPED_HEADER_INSTALL_DIR)
41+
ament_export_include_directories("include/${PROJECT_NAME}")
42+
install(DIRECTORY include/ DESTINATION include/${PROJECT_NAME}
43+
)
44+
else()
45+
ament_export_include_directories("include")
46+
install(DIRECTORY include/ DESTINATION include
47+
)
48+
endif()
4849
endif()
4950

5051
# Export and install all libraries
@@ -79,6 +80,5 @@ macro(autoware_ament_auto_package)
7980
endforeach()
8081

8182
# Call ament_package with any unparsed arguments
82-
set(_unparsed_args ${_ARG_AUTOWARE_AMENT_AUTO_PACKAGE_UNPARSED_ARGUMENTS})
83-
ament_package(${_unparsed_args})
83+
ament_package(${_ARG_AUTOWARE_AMENT_AUTO_PACKAGE_UNPARSED_ARGUMENTS})
8484
endmacro()

0 commit comments

Comments
 (0)