From eceda757c066bef36489d4a10ec414d797935081 Mon Sep 17 00:00:00 2001
From: Shane Loretz <sloretz@openrobotics.org>
Date: Fri, 6 Aug 2021 15:32:03 -0700
Subject: [PATCH] Use FindPython3 and make Python dependency explicit (#322)

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
---
 CMakeLists.txt | 5 ++++-
 package.xml    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b303dc77..c8487612 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,9 +122,12 @@ set(target_dependencies
   "resource/pkg_factories.hpp.em"
   "ros1_bridge/__init__.py")
 
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
 add_custom_command(
   OUTPUT ${generated_files}
-  COMMAND ${PYTHON_EXECUTABLE} bin/ros1_bridge_generate_factories
+  COMMAND Python3::Interpreter
+  ARGS bin/ros1_bridge_generate_factories
     --output-path "${generated_path}" --template-dir resource
   DEPENDS ${target_dependencies}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/package.xml b/package.xml
index 40fc76b6..fa74da11 100644
--- a/package.xml
+++ b/package.xml
@@ -12,6 +12,7 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_index_python</buildtool_depend>
+  <buildtool_depend>python3</buildtool_depend>
   <buildtool_depend>python3-catkin-pkg-modules</buildtool_depend>
   <buildtool_depend>rosidl_cmake</buildtool_depend>
   <buildtool_depend>rosidl_parser</buildtool_depend>