Skip to content

Commit

Permalink
Remove use of python_cmake_module (#1570)
Browse files Browse the repository at this point in the history
* Stop using python_cmake_module.

We really don't need it anymore, and can just use the
builtin find_package(Python3).

* Set hints to find the python version we actually want.

The comment in the commit explains the reasoning behind it.

Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
clalancette authored Oct 3, 2024
1 parent e75d6d6 commit babdf6b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
26 changes: 16 additions & 10 deletions rosbag2_py/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.20)
project(rosbag2_py)

# Default to C99
Expand All @@ -16,15 +16,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

# Figure out Python3 debug/release before anything else can find_package it
if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
find_package(python_cmake_module REQUIRED)
find_package(PythonExtra REQUIRED)

# Force FindPython3 to use the debug interpreter where ROS 2 expects it
set(Python3_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}")
endif()

find_package(ament_cmake REQUIRED)
find_package(ament_cmake_python REQUIRED)
find_package(ament_cmake_ros REQUIRED)
Expand All @@ -33,6 +24,21 @@ find_package(rosbag2_cpp REQUIRED)
find_package(rosbag2_storage REQUIRED)
find_package(rosbag2_transport REQUIRED)

# By default, without the settings below, find_package(Python3) will attempt
# to find the newest python version it can, and additionally will find the
# most specific version. For instance, on a system that has
# /usr/bin/python3.10, /usr/bin/python3.11, and /usr/bin/python3, it will find
# /usr/bin/python3.11, even if /usr/bin/python3 points to /usr/bin/python3.10.
# The behavior we want is to prefer the "system" installed version unless the
# user specifically tells us othewise through the Python3_EXECUTABLE hint.
# Setting CMP0094 to NEW means that the search will stop after the first
# python version is found. Setting Python3_FIND_UNVERSIONED_NAMES means that
# the search will prefer /usr/bin/python3 over /usr/bin/python3.11. And that
# latter functionality is only available in CMake 3.20 or later, so we need
# at least that version.
cmake_policy(SET CMP0094 NEW)
set(Python3_FIND_UNVERSIONED_NAMES FIRST)

# Find python before pybind11
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)

Expand Down
1 change: 0 additions & 1 deletion rosbag2_py/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

<buildtool_depend>ament_cmake_ros</buildtool_depend>
<buildtool_depend>ament_cmake_python</buildtool_depend>
<buildtool_depend>python_cmake_module</buildtool_depend>

<depend>pybind11_vendor</depend>
<depend>rosbag2_compression</depend>
Expand Down
1 change: 0 additions & 1 deletion rosbag2_test_common/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake_python</buildtool_depend>
<buildtool_depend>python_cmake_module</buildtool_depend>

<build_depend>rclcpp</build_depend>
<build_depend>rcutils</build_depend>
Expand Down

0 comments on commit babdf6b

Please sign in to comment.