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

php: add detection of PHP 7.4

Browse Source
This commit is contained in:
Sébastien Helleu 2019-12-14 11:25:07 +01:00
parent 019bc79b0f
commit 72b107a970
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -25,6 +25,7 @@ New features::
Build:: Build::
* irc: fix build with GnuTLS < 3.1.0 (issue #1431) * irc: fix build with GnuTLS < 3.1.0 (issue #1431)
* php: add detection of PHP 7.4
[[v2.7]] [[v2.7]]
== Version 2.7 (2019-12-08) == Version 2.7 (2019-12-08)

6
cmake/FindPHP.cmake
View File

@ -1,5 +1,6 @@
# #
# Copyright (C) 2003-2017 Adam Saponara <as@php.net> # Copyright (C) 2017 Adam Saponara <as@php.net>
# Copyright (C) 2017-2019 Sébastien Helleu <flashcode@flashtux.org>
# #
# This file is part of WeeChat, the extensible chat client. # This file is part of WeeChat, the extensible chat client.
# #
@ -28,6 +29,7 @@ endif()
if(NOT PHP_FOUND) if(NOT PHP_FOUND)
find_program(PHP_CONFIG_EXECUTABLE NAMES find_program(PHP_CONFIG_EXECUTABLE NAMES
php-config7.4 php-config74
php-config7.3 php-config73 php-config7.3 php-config73
php-config7.2 php-config72 php-config7.2 php-config72
php-config7.1 php-config71 php-config7.1 php-config71
@ -41,7 +43,7 @@ if(NOT PHP_FOUND)
execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
if(${PHP_VERSION} MATCHES "^7") if(${PHP_VERSION} MATCHES "^7")
find_library(PHP_LIB find_library(PHP_LIB
NAMES php7.3 php7.2 php7.1 php7.0 php7 NAMES php7.4 php7.3 php7.2 php7.1 php7.0 php7
HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64 HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
) )
if(PHP_LIB) if(PHP_LIB)