blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

python: add detection of Python 3.5

Browse Source
This commit is contained in:
Sébastien Helleu 2016-06-21 19:39:20 +02:00
parent 1989285462
commit aec9e2ebca
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.adoc
View File

@ -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)

4
cmake/FindPython.cmake
View File

@ -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()

2
configure.ac
View File

@ -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