From 09aac12178718298247b0e599e4633df210bd24a Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Tue, 22 Jun 2021 16:32:48 -0700 Subject: [PATCH] Use python_d for test_cli_extension in Debug mode Signed-off-by: Shane Loretz --- rosidl_generator_py/CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt index d3dbe50b..5f74d58f 100644 --- a/rosidl_generator_py/CMakeLists.txt +++ b/rosidl_generator_py/CMakeLists.txt @@ -23,6 +23,14 @@ if(BUILD_TESTING) find_package(test_interface_files REQUIRED) + find_package(python_cmake_module REQUIRED) + find_package(PythonExtra MODULE REQUIRED) + + set(BUILDTYPE_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}") + if(WIN32 AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set(BUILDTYPE_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}") + endif() + include(cmake/register_py.cmake) include(cmake/rosidl_generator_py_get_typesupports.cmake) @@ -58,23 +66,21 @@ if(BUILD_TESTING) set(_append_library_dirs "${CMAKE_CURRENT_BINARY_DIR}/$") endif() - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}") - if(WIN32 AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}") - endif() set(pythonpath "${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_py;${CMAKE_CURRENT_SOURCE_DIR}") if(NOT WIN32) string(REPLACE ";" ":" pythonpath "${pythonpath}") endif() ament_add_pytest_test(test_interfaces_py "test/test_interfaces.py" - PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}" + PYTHON_EXECUTABLE "${BUILDTYPE_PYTHON_EXECUTABLE}" APPEND_ENV "PYTHONPATH=${pythonpath}" APPEND_LIBRARY_DIRS "${_append_library_dirs}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_py" ) endif() - ament_add_pytest_test(test_cli_extension test/test_cli_extension.py) + ament_add_pytest_test(test_cli_extension test/test_cli_extension.py + PYTHON_EXECUTABLE "${BUILDTYPE_PYTHON_EXECUTABLE}" + ) endif() ament_package(