Stop using python_cmake_module. (#93)
* 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:
@@ -8,6 +8,7 @@ if(NOT CMAKE_CXX_STANDARD)
|
||||
endif()
|
||||
|
||||
find_package(ament_cmake REQUIRED)
|
||||
find_package(ament_cmake_python REQUIRED)
|
||||
|
||||
find_package(rclcpp REQUIRED)
|
||||
find_package(sensor_msgs REQUIRED)
|
||||
@@ -81,24 +82,11 @@ if(BUILD_TESTING)
|
||||
target_link_libraries(projection_test laser_geometry rclcpp::rclcpp)
|
||||
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)
|
||||
|
||||
ament_add_pytest_test(projection test/projection_test.py
|
||||
TIMEOUT 120
|
||||
PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}"
|
||||
)
|
||||
|
||||
set(PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}")
|
||||
endif()
|
||||
|
||||
ament_package()
|
||||
|
||||
Reference in New Issue
Block a user