Skip to content
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

Jump to bottom

Find the python version specified in ROS_PYTHON_VERSION #939

Merged
merged 4 commits into from
May 31, 2018
Merged

Find the python version specified in ROS_PYTHON_VERSION #939

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
919b3e9
Find the appropriate python interpreter based on ROS_PYTHON_VERSION.
clalancette May 5, 2018
9ccde17
Use ROS_PYTHON_VERSION to find the correct python version.
clalancette May 18, 2018
ca20ea7
Use the PYTHON_VERSION cache variable.
clalancette May 18, 2018
97a9975
Simplify even further.
clalancette May 18, 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
8 changes: 2 additions & 6 deletions cmake/python.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# the CMake variable PYTHON_INSTALL_DIR has the same value as the Python function catkin.builder.get_python_install_dir()

set(PYTHON_VERSION "" CACHE STRING "Specify specific Python version to use ('major.minor' or 'major')")
if(PYTHON_VERSION)
find_package(PythonInterp "${PYTHON_VERSION}" REQUIRED)
else()
find_package(PythonInterp REQUIRED)
endif()
set(PYTHON_VERSION "$ENV{ROS_PYTHON_VERSION}" CACHE STRING "Specify specific Python version to use ('major.minor' or 'major')")
find_package(PythonInterp ${PYTHON_VERSION} REQUIRED)

message(STATUS "Using PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")

Expand Down