Use FindPython3 (#118)

Signed-off-by: Shane Loretz <[email protected]>
ros2 · Aug 12, 2021 · 120f4d9 · 120f4d9
1 parent feaf7e7
commit 120f4d9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/rosidl_typesupport_c/cmake/rosidl_typesupport_c_generate_interfaces.cmake b/rosidl_typesupport_c/cmake/rosidl_typesupport_c_generate_interfaces.cmake
@@ -68,10 +68,13 @@ rosidl_write_generator_arguments(
   TARGET_DEPENDENCIES ${target_dependencies}
 )
 
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
 get_used_typesupports(typesupports "rosidl_typesupport_c")
 add_custom_command(
   OUTPUT ${_generated_sources}
-  COMMAND ${PYTHON_EXECUTABLE} ${rosidl_typesupport_c_BIN}
+  COMMAND Python3::Interpreter
+  ARGS ${rosidl_typesupport_c_BIN}
   --generator-arguments-file "${generator_arguments_file}"
   --typesupports ${typesupports}
   DEPENDS ${target_dependencies}

diff --git a/rosidl_typesupport_c/package.xml b/rosidl_typesupport_c/package.xml
@@ -11,6 +11,8 @@
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
+  <buildtool_export_depend>python3</buildtool_export_depend>
+
   <depend>rcpputils</depend>
   <depend>rcutils</depend>
 

diff --git a/rosidl_typesupport_cpp/cmake/rosidl_typesupport_cpp_generate_interfaces.cmake b/rosidl_typesupport_cpp/cmake/rosidl_typesupport_cpp_generate_interfaces.cmake
@@ -68,10 +68,13 @@ rosidl_write_generator_arguments(
   TARGET_DEPENDENCIES ${target_dependencies}
 )
 
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
 get_used_typesupports(typesupports "rosidl_typesupport_cpp")
 add_custom_command(
   OUTPUT ${_generated_sources}
-  COMMAND ${PYTHON_EXECUTABLE} ${rosidl_typesupport_cpp_BIN}
+  COMMAND Python3::Interpreter
+  ARGS ${rosidl_typesupport_cpp_BIN}
   --generator-arguments-file "${generator_arguments_file}"
   --typesupports ${typesupports}
   DEPENDS ${target_dependencies}

diff --git a/rosidl_typesupport_cpp/package.xml b/rosidl_typesupport_cpp/package.xml
@@ -11,6 +11,8 @@
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
+  <buildtool_export_depend>python3</buildtool_export_depend>
+
   <depend>rcpputils</depend>
   <build_depend>rosidl_runtime_c</build_depend>
   <build_depend>rosidl_typesupport_c</build_depend>