diff --git a/launch_testing_ament_cmake/CMakeLists.txt b/launch_testing_ament_cmake/CMakeLists.txt index fccdfb5b..9ab3f578 100644 --- a/launch_testing_ament_cmake/CMakeLists.txt +++ b/launch_testing_ament_cmake/CMakeLists.txt @@ -24,10 +24,6 @@ if(BUILD_TESTING) message(FATAL_ERROR "launch_testing package not found") endif() - # Provides PYTHON_EXECUTABLE_DEBUG - find_package(python_cmake_module REQUIRED) - find_package(PythonExtra REQUIRED) - # Test argument passing. This test won't pass unless you give it an argument add_launch_test( "${LAUNCH_TESTING_INSTALL_PREFIX}/share/launch_testing/examples/args_launch_test.py" diff --git a/launch_testing_ament_cmake/cmake/add_launch_test.cmake b/launch_testing_ament_cmake/cmake/add_launch_test.cmake index 4e9216cf..b9b19b3d 100644 --- a/launch_testing_ament_cmake/cmake/add_launch_test.cmake +++ b/launch_testing_ament_cmake/cmake/add_launch_test.cmake @@ -60,12 +60,7 @@ macro(parse_launch_test_arguments namespace filename) endif() if(NOT ${namespace}_PYTHON_EXECUTABLE) - set(${namespace}_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}") - if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(${namespace}_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}") - endif() - endif() + set(${namespace}_PYTHON_EXECUTABLE "${Python3_EXECUTABLE}") endif() set(${namespace}_FILE_NAME NOTFOUND) diff --git a/launch_testing_ament_cmake/launch_testing_ament_cmake-extras.cmake b/launch_testing_ament_cmake/launch_testing_ament_cmake-extras.cmake index 232c550f..17abc41f 100644 --- a/launch_testing_ament_cmake/launch_testing_ament_cmake-extras.cmake +++ b/launch_testing_ament_cmake/launch_testing_ament_cmake-extras.cmake @@ -13,8 +13,5 @@ # limitations under the License. find_package(ament_cmake_test REQUIRED) -# Provides PYTHON_EXECUTABLE_DEBUG -find_package(python_cmake_module REQUIRED) -find_package(PythonExtra REQUIRED) include("${launch_testing_ament_cmake_DIR}/add_launch_test.cmake") diff --git a/launch_testing_ament_cmake/package.xml b/launch_testing_ament_cmake/package.xml index a8b1bf28..64240039 100644 --- a/launch_testing_ament_cmake/package.xml +++ b/launch_testing_ament_cmake/package.xml @@ -21,12 +21,10 @@ ament_cmake ament_cmake_test - python_cmake_module launch_testing ament_cmake_copyright launch_testing - python_cmake_module ament_cmake