From 589f579e83d1a990a00fcb4615da38ee1c85de9e Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 10 Jun 2016 12:21:23 -0700 Subject: [PATCH] require Python 3.5 --- python_cmake_module/cmake/Modules/FindPythonExtra.cmake | 6 ++---- .../cmake/rosidl_generator_py_generate_interfaces.cmake | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/python_cmake_module/cmake/Modules/FindPythonExtra.cmake b/python_cmake_module/cmake/Modules/FindPythonExtra.cmake index 12c8f482b..5e489d3e5 100644 --- a/python_cmake_module/cmake/Modules/FindPythonExtra.cmake +++ b/python_cmake_module/cmake/Modules/FindPythonExtra.cmake @@ -39,9 +39,7 @@ set(PythonExtra_FOUND FALSE) -# NOTE(esteve): required for CMake-2.8 in Ubuntu 14.04 -set(Python_ADDITIONAL_VERSIONS 3.4) -find_package(PythonInterp 3.4 REQUIRED) +find_package(PythonInterp 3.5 REQUIRED) if(PYTHONINTERP_FOUND) if(APPLE) @@ -129,7 +127,7 @@ if(PYTHONINTERP_FOUND) set(PythonExtra_LIBRARIES "${PYTHON_LIBRARY}") message(STATUS "Using PythonExtra_LIBRARIES: ${PythonExtra_LIBRARIES}") else() - find_package(PythonLibs 3.4 REQUIRED) + find_package(PythonLibs 3.5 REQUIRED) message(STATUS "Using PYTHON_INCLUDE_DIRS: ${PYTHON_INCLUDE_DIRS}") message(STATUS "Using PYTHON_LIBRARIES: ${PYTHON_LIBRARIES}") set(PythonExtra_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}") diff --git a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake index cff9800f1..51090d54d 100644 --- a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake +++ b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake @@ -16,9 +16,7 @@ find_package(rosidl_generator_c REQUIRED) find_package(rmw_implementation_cmake REQUIRED) find_package(rmw REQUIRED) -# NOTE(esteve): required for CMake-2.8 in Ubuntu 14.04 -set(Python_ADDITIONAL_VERSIONS 3.4) -find_package(PythonInterp 3.4 REQUIRED) +find_package(PythonInterp 3.5 REQUIRED) find_package(python_cmake_module REQUIRED) find_package(PythonExtra MODULE)