diff --git a/CHANGELOG.md b/CHANGELOG.md index f4e95695f..41ca0859b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,8 @@ - relay/api: combine request headers with the same name ([#2206](https://github.com/weechat/weechat/issues/2206)) - core, plugins: simplify help on parameters that can be repeated in commands - core: add optional hook types in command `/debug hooks` -- build: fix detection of Ruby on macOS 14, require CMake ≥ 3.18 ([#1156](https://github.com/weechat/weechat/issues/1156)) +- php: add detection of PHP 8.3 and 8.4 +- ruby: fix detection of Ruby on macOS 14, require CMake ≥ 3.18 ([#1156](https://github.com/weechat/weechat/issues/1156)) - build: require Curl ≥ 7.47.0 ([#2195](https://github.com/weechat/weechat/issues/2195)) - build: require GnuTLS ≥ 3.3.0 ([#2193](https://github.com/weechat/weechat/issues/2193)) diff --git a/cmake/FindPHP.cmake b/cmake/FindPHP.cmake index 46271d4ae..ff8c2d5b3 100644 --- a/cmake/FindPHP.cmake +++ b/cmake/FindPHP.cmake @@ -29,6 +29,8 @@ endif() if(NOT PHP_FOUND) find_program(PHP_CONFIG_EXECUTABLE NAMES + php-config8.4 php-config84 + php-config8.3 php-config83 php-config8.2 php-config82 php-config8.1 php-config81 php-config8.0 php-config80 @@ -48,7 +50,7 @@ if(NOT PHP_FOUND) execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) if(${PHP_VERSION} MATCHES "^[78]") find_library(PHP_LIB - NAMES php8.2 php82 php8.1 php81 php8.0 php80 php8 php7.4 php74 php7.3 php73 php7.2 php72 php7.1 php71 php7.0 php70 php7 php + NAMES php8.4 php84 php8.3 php83 php8.2 php82 php8.1 php81 php8.0 php80 php8 php7.4 php74 php7.3 php73 php7.2 php72 php7.1 php71 php7.0 php70 php7 php HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64 ) if(PHP_LIB)