Skip to content

Use debug python executable on windows #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikaelarguedas merged 2 commits into from
Jun 14, 2018
Merged

Use debug python executable on windows #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18bdff8
use debug python executable on windows
sloretz Jun 12, 2018
a3aea36
get python debug executable from pythonextra
mikaelarguedas Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions test_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ project(test_cli)
find_package(ament_cmake_auto REQUIRED)

if(BUILD_TESTING)
# Provides PYTHON_EXECUTABLE_DEBUG
find_package(python_cmake_module REQUIRED)
find_package(PythonExtra REQUIRED)
set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
if(WIN32)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}")
endif()
endif()

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
Expand All @@ -24,6 +34,7 @@ if(BUILD_TESTING)

ament_add_pytest_test(test_params_yaml
test/test_params_yaml.py
PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}"
ENV
INITIAL_PARAMS_RCLCPP=$<TARGET_FILE:initial_params_rclcpp>
)
Expand Down
1 change: 1 addition & 0 deletions test_cli/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>python_cmake_module</buildtool_depend>

<build_depend>ament_cmake</build_depend>

Expand Down
11 changes: 11 additions & 0 deletions test_cli_remapping/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ project(test_cli_remapping)
find_package(ament_cmake_auto REQUIRED)

if(BUILD_TESTING)
# Provides PYTHON_EXECUTABLE_DEBUG
find_package(python_cmake_module REQUIRED)
find_package(PythonExtra REQUIRED)
set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
if(WIN32)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}")
endif()
endif()

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
Expand All @@ -26,6 +36,7 @@ if(BUILD_TESTING)

ament_add_pytest_test(test_cli_remapping
test/test_cli_remapping.py
PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}"
ENV
NAME_MAKER_RCLCPP=$<TARGET_FILE:name_maker_rclcpp>
NAME_MAKER_RCLPY=${CMAKE_CURRENT_SOURCE_DIR}/test/name_maker.py
Expand Down
1 change: 1 addition & 0 deletions test_cli_remapping/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>python_cmake_module</buildtool_depend>

<build_depend>ament_cmake</build_depend>

Expand Down
4 changes: 4 additions & 0 deletions test_communication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ if(BUILD_TESTING)

find_package(ament_cmake_pytest REQUIRED)

# Provides PYTHON_EXECUTABLE_DEBUG
find_package(python_cmake_module REQUIRED)
find_package(PythonExtra REQUIRED)

# get the rmw implementations ahead of time
find_package(rmw_implementation_cmake REQUIRED)
get_available_rmw_implementations(rmw_implementations2)
Expand Down
1 change: 1 addition & 0 deletions test_communication/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<build_depend>rosidl_default_generators</build_depend>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>python_cmake_module</buildtool_depend>

<exec_depend>builtin_interfaces</exec_depend>
<exec_depend>rosidl_default_runtime</exec_depend>
Expand Down