Skip to content

Commit 9c1c6f3

Browse files
author
AugusteBourgois
committed
export target in the macro
1 parent d169ef2 commit 9c1c6f3

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ install(
6666
DESTINATION include/generate_parameter_library_example
6767
)
6868

69-
install(TARGETS minimal_publisher admittance_controller_parameters
69+
install(TARGETS minimal_publisher
7070
EXPORT export_generate_parameter_library_example
7171
ARCHIVE DESTINATION lib
7272
LIBRARY DESTINATION lib

generate_parameter_library/cmake/generate_parameter_library.cmake

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# POSSIBILITY OF SUCH DAMAGE.
2828

2929

30-
function(generate_parameter_library LIB_NAME YAML_FILE)
30+
macro(generate_parameter_library LIB_NAME YAML_FILE)
3131
find_program(generate_parameter_library_cpp_BIN NAMES "generate_parameter_library_cpp")
3232
if(NOT generate_parameter_library_cpp_BIN)
3333
message(FATAL_ERROR "generate_parameter_library_cpp() variable 'generate_parameter_library_cpp_BIN' must not be empty")
@@ -53,18 +53,18 @@ function(generate_parameter_library LIB_NAME YAML_FILE)
5353
endif()
5454

5555
# Set the yaml file parameter to be relative to the current source dir
56-
set(YAML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${YAML_FILE})
56+
set(YAML_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${YAML_FILE})
5757

5858
# Set the output parameter header file name
5959
set(PARAM_HEADER_FILE ${LIB_INCLUDE_DIR}/${LIB_NAME}.hpp)
6060

6161
# Generate the header for the library
6262
add_custom_command(
6363
OUTPUT ${PARAM_HEADER_FILE}
64-
COMMAND ${generate_parameter_library_cpp_BIN} ${PARAM_HEADER_FILE} ${YAML_FILE} ${VALIDATE_HEADER_FILENAME}
65-
DEPENDS ${YAML_FILE} ${VALIDATE_HEADER}
64+
COMMAND ${generate_parameter_library_cpp_BIN} ${PARAM_HEADER_FILE} ${YAML_FILE_PATH} ${VALIDATE_HEADER_FILENAME}
65+
DEPENDS ${YAML_FILE_PATH} ${VALIDATE_HEADER}
6666
COMMENT
67-
"Running `${generate_parameter_library_cpp_BIN} ${PARAM_HEADER_FILE} ${YAML_FILE} ${VALIDATE_HEADER_FILENAME}`"
67+
"Running `${generate_parameter_library_cpp_BIN} ${PARAM_HEADER_FILE} ${YAML_FILE_PATH} ${VALIDATE_HEADER_FILENAME}`"
6868
VERBATIM
6969
)
7070
# necessary so that #include <param_file.hpp> can be used in the local package (deprecated)
@@ -98,9 +98,10 @@ function(generate_parameter_library LIB_NAME YAML_FILE)
9898
tl_expected::tl_expected
9999
)
100100
install(DIRECTORY ${LIB_INCLUDE_DIR} DESTINATION include)
101+
install(TARGETS ${LIB_NAME} EXPORT ${PROJECT_NAME}Targets)
102+
ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET)
101103
ament_export_dependencies(fmt parameter_traits rclcpp rclcpp_lifecycle rsl tcb_span tl_expected)
102-
set(_AMENT_CMAKE_EXPORT_DEPENDENCIES "${_AMENT_CMAKE_EXPORT_DEPENDENCIES}" PARENT_SCOPE)
103-
endfunction()
104+
endmacro()
104105

105106

106107
function(generate_parameter_module LIB_NAME YAML_FILE)

0 commit comments

Comments
 (0)