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

python: add detection of Python 3.7

Browse Source
This commit is contained in:
Sébastien Helleu 2018-07-12 19:24:56 +02:00
parent 426405c997
commit 7554febf7e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -79,6 +79,7 @@ Build::
* core: fix build with CMake and Ninja
* debian: add package weechat-headless with the headless binary and its man page
* javascript: fix compilation of javascript plugin with autotools on some Linux distributions (issue #1208)
* python: add detection of Python 3.7
[[v2.1]]
== Version 2.1 (2018-03-18)

4
cmake/FindPython.cmake
View File

@ -35,7 +35,7 @@ endif()
if(ENABLE_PYTHON3)
find_program(PYTHON_EXECUTABLE
NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
NAMES python3.7 python3.6 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.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
NAMES python3.7 python3.6 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

@ -547,7 +547,7 @@ PYTHON_VERSION=
if test "x$enable_python" = "xyes" ; then
if test "x$enable_python3" = "xyes" ; then
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)
AC_PATH_PROGS(PYTHON, python3.7 python3.6 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