@@ -23,6 +23,14 @@ if(BUILD_TESTING)
2323
2424 find_package (test_interface_files REQUIRED)
2525
26+ find_package (python_cmake_module REQUIRED)
27+ find_package (PythonExtra MODULE REQUIRED)
28+
29+ set (BUILDTYPE_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE} " )
30+ if (WIN32 AND "${CMAKE_BUILD_TYPE} " STREQUAL "Debug" )
31+ set (BUILDTYPE_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG} " )
32+ endif ()
33+
2634 include (cmake/register_py.cmake)
2735 include (cmake/rosidl_generator_py_get_typesupports.cmake)
2836
@@ -58,23 +66,21 @@ if(BUILD_TESTING)
5866 set (_append_library_dirs "${CMAKE_CURRENT_BINARY_DIR} /$<CONFIG>" )
5967 endif ()
6068
61- set (_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE} " )
62- if (WIN32 AND "${CMAKE_BUILD_TYPE} " STREQUAL "Debug" )
63- set (_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG} " )
64- endif ()
6569 set (pythonpath "${CMAKE_CURRENT_BINARY_DIR} /rosidl_generator_py;${CMAKE_CURRENT_SOURCE_DIR} " )
6670 if (NOT WIN32 )
6771 string (REPLACE ";" ":" pythonpath "${pythonpath} " )
6872 endif ()
6973 ament_add_pytest_test(test_interfaces_py "test/test_interfaces.py"
70- PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE } "
74+ PYTHON_EXECUTABLE "${BUILDTYPE_PYTHON_EXECUTABLE } "
7175 APPEND_ENV "PYTHONPATH=${pythonpath} "
7276 APPEND_LIBRARY_DIRS "${_append_library_dirs} "
7377 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR} /rosidl_generator_py"
7478 )
7579 endif ()
7680
77- ament_add_pytest_test(test_cli_extension test /test_cli_extension.py)
81+ ament_add_pytest_test(test_cli_extension test /test_cli_extension.py
82+ PYTHON_EXECUTABLE "${BUILDTYPE_PYTHON_EXECUTABLE} "
83+ )
7884endif ()
7985
8086ament_package(
0 commit comments