Skip to content

Commit a12e6c4

Browse files
committed
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]>
1 parent e2bd969 commit a12e6c4

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,22 +177,30 @@ endif()
177177
rosidl_get_typesupport_target(c_typesupport_target "${rosidl_generate_interfaces_TARGET}" "rosidl_typesupport_c")
178178
target_link_libraries(${_target_name_lib} PRIVATE ${c_typesupport_target})
179179

180-
181180
set(_target_name_bases_lib "${rosidl_generate_interfaces_TARGET}__bases")
182181
add_library(${_target_name_bases_lib} SHARED ${_generated_c_base_files})
183182
add_dependencies(
184183
${_target_name_bases_lib}
185184
${rosidl_generate_interfaces_TARGET}${_target_suffix})
186-
target_link_libraries(${_target_name_bases_lib} ${PythonExtra_LIBRARIES})
187-
target_include_directories(${_target_name_bases_lib} PRIVATE ${PythonExtra_INCLUDE_DIRS})
185+
target_link_libraries(
186+
${_target_name_bases_lib}
187+
Python3::NumPy
188+
Python3::Python
189+
${PythonExtra_LIBRARIES}
190+
)
191+
target_include_directories(
192+
${_target_name_bases_lib} PRIVATE
193+
${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_c
194+
${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_py
195+
${PythonExtra_INCLUDE_DIRS}
196+
)
188197

189198
set_target_properties(${_target_name_bases_lib} PROPERTIES
190199
COMPILE_OPTIONS "${_extension_compile_flags}"
191200
PREFIX ""
192201
LIBRARY_OUTPUT_DIRECTORY${_build_type} ${_output_path}
193202
RUNTIME_OUTPUT_DIRECTORY${_build_type} ${_output_path}
194203
OUTPUT_NAME "_${PROJECT_NAME}_bases${PythonExtra_EXTENSION_SUFFIX}"
195-
SUFFIX "${PythonExtra_EXTENSION_EXTENSION}"
196204
)
197205
if(NOT rosidl_generate_interfaces_SKIP_INSTALL)
198206
install(TARGETS ${_target_name_bases_lib}

rosidl_generator_py/resource/_msg.py.em

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class @(message.structure.namespaced_type.name)(_bases.@(message.structure.names
230230

231231
# This field is modified after class creation.
232232
# See the comment to Metaclass_@(message.structure.namespaced_type.name).__new__
233-
__slots__ = []
233+
__slots__ = ['_check_fields']
234234

235235
_fields_and_field_types = {
236236
@[for member in message.structure.members]@

0 commit comments

Comments
 (0)