Skip to content

Commit 00c6fbf

Browse files
authored
Stop using python_cmake_module. (#760)
We really don't need it anymore, and can just use the builtin find_package(Python3). Signed-off-by: Chris Lalancette <[email protected]>
1 parent f3e9cfe commit 00c6fbf

File tree

4 files changed

+1
-15
lines changed

4 files changed

+1
-15
lines changed

launch_testing_ament_cmake/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ if(BUILD_TESTING)
2424
message(FATAL_ERROR "launch_testing package not found")
2525
endif()
2626

27-
# Provides PYTHON_EXECUTABLE_DEBUG
28-
find_package(python_cmake_module REQUIRED)
29-
find_package(PythonExtra REQUIRED)
30-
3127
# Test argument passing. This test won't pass unless you give it an argument
3228
add_launch_test(
3329
"${LAUNCH_TESTING_INSTALL_PREFIX}/share/launch_testing/examples/args_launch_test.py"

launch_testing_ament_cmake/cmake/add_launch_test.cmake

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,7 @@ macro(parse_launch_test_arguments namespace filename)
6060
endif()
6161

6262
if(NOT ${namespace}_PYTHON_EXECUTABLE)
63-
set(${namespace}_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
64-
if(WIN32)
65-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
66-
set(${namespace}_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}")
67-
endif()
68-
endif()
63+
set(${namespace}_PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
6964
endif()
7065

7166
set(${namespace}_FILE_NAME NOTFOUND)

launch_testing_ament_cmake/launch_testing_ament_cmake-extras.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,5 @@
1313
# limitations under the License.
1414

1515
find_package(ament_cmake_test REQUIRED)
16-
# Provides PYTHON_EXECUTABLE_DEBUG
17-
find_package(python_cmake_module REQUIRED)
18-
find_package(PythonExtra REQUIRED)
1916

2017
include("${launch_testing_ament_cmake_DIR}/add_launch_test.cmake")

launch_testing_ament_cmake/package.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@
2121
<buildtool_depend>ament_cmake</buildtool_depend>
2222

2323
<buildtool_export_depend>ament_cmake_test</buildtool_export_depend>
24-
<buildtool_export_depend>python_cmake_module</buildtool_export_depend>
2524
<buildtool_export_depend>launch_testing</buildtool_export_depend>
2625

2726
<test_depend>ament_cmake_copyright</test_depend>
2827
<test_depend>launch_testing</test_depend>
29-
<test_depend>python_cmake_module</test_depend>
3028

3129
<export>
3230
<build_type>ament_cmake</build_type>

0 commit comments

Comments
 (0)