Stop using python_cmake_module.

We really don't need it anymore, and can just use the builtin find_package(Python3). Signed-off-by: Chris Lalancette <clalancette@gmail.com>
ros2 · Jun 4, 2024 · 44f78b8 · 44f78b8
1 parent 179f688
commit 44f78b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt
@@ -22,9 +22,6 @@ if(BUILD_TESTING)
 
   find_package(test_interface_files REQUIRED)
 
-  find_package(python_cmake_module REQUIRED)
-  find_package(PythonExtra MODULE REQUIRED)
-
   include(cmake/register_py.cmake)
   include(cmake/rosidl_generator_py_get_typesupports.cmake)
 

diff --git a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-find_package(python_cmake_module REQUIRED)
-find_package(PythonExtra REQUIRED)
 find_package(rmw REQUIRED)
 find_package(rosidl_runtime_c REQUIRED)
 find_package(rosidl_typesupport_c REQUIRED)
@@ -184,7 +182,9 @@ foreach(_typesupport_impl ${_typesupport_impls})
     ${rosidl_generate_interfaces_TARGET}__rosidl_typesupport_c
   )
 
-  set_target_properties(${_target_name} PROPERTIES DEBUG_POSTFIX "${PythonExtra_POSTFIX}")
+  if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set_target_properties(${_target_name} PROPERTIES DEBUG_POSTFIX "_d")
+  endif()
   # target_compile_options(${_target_name} PRIVATE ${_extension_compile_flags})
   # TODO(sloretz) use target_compile_options when python extension passes -Wpedantic
   set_target_properties(${_target_name} PROPERTIES COMPILE_OPTIONS "${_extension_compile_flags}")

diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml
@@ -23,7 +23,6 @@
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
   <buildtool_export_depend>ament_index_python</buildtool_export_depend>
-  <buildtool_export_depend>python_cmake_module</buildtool_export_depend>
   <buildtool_export_depend>rosidl_generator_c</buildtool_export_depend>
   <buildtool_export_depend>rosidl_pycommon</buildtool_export_depend>
   <buildtool_export_depend>rosidl_typesupport_c</buildtool_export_depend>
@@ -53,7 +52,6 @@
   <test_depend>ament_lint_common</test_depend>
   <test_depend>python3-numpy</test_depend>
   <test_depend>python3-pytest</test_depend>
-  <test_depend>python_cmake_module</test_depend>
   <test_depend>rmw</test_depend>
   <test_depend>rosidl_cmake</test_depend>