DuongTD/laser_geometry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using python_cmake_module. (#93)

Browse Source 
* Stop using python_cmake_module.

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

* Add in missing ament_cmake_python dependency.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
This commit is contained in:
Chris Lalancette 2024-10-03 14:18:59 -04:00 committed by GitHub
parent 97e1b4ad3a
commit 291fcb3cb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -8,6 +8,7 @@ if(NOT CMAKE_CXX_STANDARD)
endif() endif()
find_package(ament_cmake REQUIRED) find_package(ament_cmake REQUIRED)
find_package(ament_cmake_python REQUIRED)
find_package(rclcpp REQUIRED) find_package(rclcpp REQUIRED)
find_package(sensor_msgs REQUIRED) find_package(sensor_msgs REQUIRED)
@ -81,24 +82,11 @@ if(BUILD_TESTING)
target_link_libraries(projection_test laser_geometry rclcpp::rclcpp) target_link_libraries(projection_test laser_geometry rclcpp::rclcpp)
endif() endif()
# Python test
# Provides PYTHON_EXECUTABLE_DEBUG
find_package(python_cmake_module REQUIRED)
find_package(PythonExtra REQUIRED)
set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}")
endif()
find_package(ament_cmake_pytest REQUIRED) find_package(ament_cmake_pytest REQUIRED)
ament_add_pytest_test(projection test/projection_test.py ament_add_pytest_test(projection test/projection_test.py
TIMEOUT 120 TIMEOUT 120
PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}"
) )
set(PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}")
endif() endif()
ament_package() ament_package()

2
package.xml
View File

@ -25,6 +25,7 @@
<author email="william@osrfoundation.org">William Woodall</author> <author email="william@osrfoundation.org">William Woodall</author>
<buildtool_depend>ament_cmake</buildtool_depend> <buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake_python</buildtool_depend>
<buildtool_depend>eigen3_cmake_module</buildtool_depend> <buildtool_depend>eigen3_cmake_module</buildtool_depend>
<buildtool_export_depend>eigen3_cmake_module</buildtool_export_depend> <buildtool_export_depend>eigen3_cmake_module</buildtool_export_depend>
@ -47,7 +48,6 @@
<test_depend>ament_lint_common</test_depend> <test_depend>ament_lint_common</test_depend>
<test_depend>ament_cmake_gtest</test_depend> <test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_cmake_pytest</test_depend> <test_depend>ament_cmake_pytest</test_depend>
<test_depend>python_cmake_module</test_depend>
<export> <export>
<build_type>ament_cmake</build_type> <build_type>ament_cmake</build_type>