Skip to content

Commit d8beefb

Browse files
export target in the macro
1 parent 7b6e66b commit d8beefb

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
unset(generate_parameter_library_cpp_BIN CACHE) # Unset the cache variable
3232
find_program(generate_parameter_library_cpp_BIN NAMES "generate_parameter_library_cpp")
3333
if(NOT generate_parameter_library_cpp_BIN)
@@ -54,18 +54,18 @@ function(generate_parameter_library LIB_NAME YAML_FILE)
5454
endif()
5555

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

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

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

106107

107108
function(generate_parameter_module LIB_NAME YAML_FILE)

0 commit comments

Comments
 (0)