Rebase fixes. Fix library lincage and include_dirs for bases lib.

Add '_check_fields' as a default value in a __slots__ list for generated messages.

Signed-off-by: EsipovPA <[email protected]>

Author: EsipovPA

rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake

@@ -191,22 +191,30 @@ endif()
 rosidl_get_typesupport_target(c_typesupport_target "${rosidl_generate_interfaces_TARGET}" "rosidl_typesupport_c")
 target_link_libraries(${_target_name_lib} PRIVATE ${c_typesupport_target})
 
-
 set(_target_name_bases_lib "${rosidl_generate_interfaces_TARGET}__bases")
 add_library(${_target_name_bases_lib} SHARED ${_generated_c_base_files})
 add_dependencies(
   ${_target_name_bases_lib}
   ${rosidl_generate_interfaces_TARGET}${_target_suffix})
-target_link_libraries(${_target_name_bases_lib} ${PythonExtra_LIBRARIES})
-target_include_directories(${_target_name_bases_lib} PRIVATE ${PythonExtra_INCLUDE_DIRS})
+target_link_libraries(
+  ${_target_name_bases_lib}
+  Python3::NumPy
+  Python3::Python
+  ${PythonExtra_LIBRARIES}
+)
+target_include_directories(
+  ${_target_name_bases_lib} PRIVATE
+  ${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_c
+  ${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_py
+  ${PythonExtra_INCLUDE_DIRS}
+)
 
 set_target_properties(${_target_name_bases_lib} PROPERTIES
   COMPILE_OPTIONS "${_extension_compile_flags}"
   PREFIX ""
   LIBRARY_OUTPUT_DIRECTORY${_build_type} ${_output_path}
   RUNTIME_OUTPUT_DIRECTORY${_build_type} ${_output_path}
   OUTPUT_NAME "_${PROJECT_NAME}_bases${PythonExtra_EXTENSION_SUFFIX}"
-  SUFFIX "${PythonExtra_EXTENSION_EXTENSION}"
 )
 if(NOT rosidl_generate_interfaces_SKIP_INSTALL)
   install(TARGETS ${_target_name_bases_lib}

rosidl_generator_py/resource/_msg.py.em

@@ -230,7 +230,7 @@ class @(message.structure.namespaced_type.name)(_bases.@(message.structure.names
 
     # This field is modified after class creation.
     # See the comment to Metaclass_@(message.structure.namespaced_type.name).__new__
-    __slots__ = []
+    __slots__ = ['_check_fields']
 
     _fields_and_field_types = {
 @[for member in message.structure.members]@