From bf5e1f67092148f07346af62a6997baa8317e5e7 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 23 Feb 2024 18:51:17 +0000 Subject: [PATCH] Remove use of python_cmake_module. Signed-off-by: Chris Lalancette --- point_cloud_transport_py/CMakeLists.txt | 27 +++++++++++++++---------- point_cloud_transport_py/package.xml | 1 - 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/point_cloud_transport_py/CMakeLists.txt b/point_cloud_transport_py/CMakeLists.txt index eadff47..a68be9b 100644 --- a/point_cloud_transport_py/CMakeLists.txt +++ b/point_cloud_transport_py/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.20) project(point_cloud_transport_py) # Default to C99 @@ -16,16 +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) @@ -34,6 +24,21 @@ find_package(pluginlib REQUIRED) find_package(rclcpp REQUIRED) find_package(sensor_msgs 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) diff --git a/point_cloud_transport_py/package.xml b/point_cloud_transport_py/package.xml index 291c2c8..39129a5 100644 --- a/point_cloud_transport_py/package.xml +++ b/point_cloud_transport_py/package.xml @@ -17,7 +17,6 @@ ament_cmake_ros ament_cmake_python - python_cmake_module point_cloud_transport pybind11_vendor