From aec9e2ebcac993211dc6333144dbb42425aa2074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Tue, 21 Jun 2016 19:39:20 +0200 Subject: [PATCH] python: add detection of Python 3.5 --- ChangeLog.adoc | 4 ++++ cmake/FindPython.cmake | 4 ++-- configure.ac | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index a8fad4f63..69a55e516 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -36,6 +36,10 @@ Documentation:: * switch to asciidoctor to build docs and man page +Build:: + + * python: add detection of Python 3.5 + [[v1.5]] == Version 1.5 (2016-05-01) diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake index 77d0fcb8d..70db1c57f 100644 --- a/cmake/FindPython.cmake +++ b/cmake/FindPython.cmake @@ -35,7 +35,7 @@ endif() if(ENABLE_PYTHON3) find_program(PYTHON_EXECUTABLE - NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python + NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python PATHS /usr/bin /usr/local/bin /usr/pkg/bin ) else() @@ -67,7 +67,7 @@ if(PYTHON_EXECUTABLE) ) if(ENABLE_PYTHON3) find_library(PYTHON_LIBRARY - NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python + NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python HINTS ${PYTHON_POSSIBLE_LIB_PATH} ) else() diff --git a/configure.ac b/configure.ac index 47e6422ef..ba80a2a08 100644 --- a/configure.ac +++ b/configure.ac @@ -508,7 +508,7 @@ PYTHON_VERSION= if test "x$enable_python" = "xyes" ; then if test "x$enable_python3" = "xyes" ; then - AC_PATH_PROGS(PYTHON, python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python) + AC_PATH_PROGS(PYTHON, python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python) else AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python) fi