From cc0dcad27640cca1b11af877e8115e8213321cc7 Mon Sep 17 00:00:00 2001 From: Stefan Fabian Date: Wed, 21 Jun 2023 10:33:06 +0200 Subject: [PATCH] Move visibility header generation to generated_headers block. --- ...dl_generator_cpp_generate_interfaces.cmake | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/rosidl_generator_cpp/cmake/rosidl_generator_cpp_generate_interfaces.cmake b/rosidl_generator_cpp/cmake/rosidl_generator_cpp_generate_interfaces.cmake index 72b1654cc..1f7159067 100644 --- a/rosidl_generator_cpp/cmake/rosidl_generator_cpp_generate_interfaces.cmake +++ b/rosidl_generator_cpp/cmake/rosidl_generator_cpp_generate_interfaces.cmake @@ -32,6 +32,17 @@ foreach(_abs_idl_file ${rosidl_generate_interfaces_ABS_IDL_FILES}) ) endforeach() +# generate header to switch between export and import for a specific package +set(_visibility_control_file + "${_output_path}/msg/rosidl_generator_cpp__visibility_control.hpp") +string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER) +configure_file( + "${rosidl_generator_cpp_TEMPLATE_DIR}/rosidl_generator_cpp__visibility_control.hpp.in" + "${_visibility_control_file}" + @ONLY +) +list(APPEND _generated_headers "${_visibility_control_file}") + set(_dependency_files "") set(_dependencies "") foreach(_pkg_name ${rosidl_generate_interfaces_DEPENDENCY_PACKAGE_NAMES}) @@ -95,18 +106,6 @@ add_custom_command( VERBATIM ) -# generate header to switch between export and import for a specific package -set(_visibility_control_file - "${_output_path}/msg/rosidl_generator_cpp__visibility_control.hpp") -string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER) -configure_file( - "${rosidl_generator_cpp_TEMPLATE_DIR}/rosidl_generator_cpp__visibility_control.hpp.in" - "${_visibility_control_file}" - @ONLY -) -list(APPEND _generated_headers "${_visibility_control_file}") - - # INTERFACE libraries can't have file-level dependencies in CMake, # so make a custom target depending on the generated files # TODO(sloretz) make this target name less generic than "__cpp" when other