diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2019-12-14 11:25:07 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2019-12-14 11:25:07 +0100 |
| commit | 72b107a970a7bed13da040be4515761ddbb1cbb4 (patch) | |
| tree | cb61e9da8737a93f8283dbc1966a029f78436ea7 | |
| parent | 019bc79b0f5b13259276b311f5c204084049ef43 (diff) | |
| download | weechat-72b107a970a7bed13da040be4515761ddbb1cbb4.zip | |
php: add detection of PHP 7.4
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | cmake/FindPHP.cmake | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index d5c00192a..02db35558 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -25,6 +25,7 @@ New features:: Build:: * irc: fix build with GnuTLS < 3.1.0 (issue #1431) + * php: add detection of PHP 7.4 [[v2.7]] == Version 2.7 (2019-12-08) diff --git a/cmake/FindPHP.cmake b/cmake/FindPHP.cmake index 9654a42d3..8cb78a6e3 100644 --- a/cmake/FindPHP.cmake +++ b/cmake/FindPHP.cmake @@ -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. # @@ -28,6 +29,7 @@ endif() if(NOT PHP_FOUND) find_program(PHP_CONFIG_EXECUTABLE NAMES + php-config7.4 php-config74 php-config7.3 php-config73 php-config7.2 php-config72 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) if(${PHP_VERSION} MATCHES "^7") 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 ) if(PHP_LIB) |