diff --git a/CHANGELOG.md b/CHANGELOG.md index c11111d1d..0c99a0720 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - php: fix return value of function hdata_longlong - tcl: fix return value of function hdata_longlong ([#2119](https://github.com/weechat/weechat/issues/2119)) +- core, relay: fix include directory of libcjson and libzstd - tests: fix relay tests on s390x ([#2118](https://github.com/weechat/weechat/issues/2118)) - tests: fix check of php plugin ([#2117](https://github.com/weechat/weechat/issues/2117)) - tests: fix compilation of tests on Fedora 40 ([#2116](https://github.com/weechat/weechat/issues/2116)) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e6e1aadfb..5c88708c3 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -92,11 +92,11 @@ include_directories(${GNUTLS_INCLUDE_PATH}) include_directories(${CURL_INCLUDE_DIRS}) if(ENABLE_ZSTD) - include_directories(${ZSTD_INCLUDE_DIRS}) + include_directories(${LIBZSTD_INCLUDE_DIRS}) endif() if(ENABLE_CJSON) - include_directories(${CJSON_INCLUDE_DIRS}) + include_directories(${LIBCJSON_INCLUDE_DIRS}) endif() include_directories("${CMAKE_BINARY_DIR}") diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt index cbafd394d..c175d50bd 100644 --- a/src/plugins/relay/CMakeLists.txt +++ b/src/plugins/relay/CMakeLists.txt @@ -68,12 +68,12 @@ list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS}) list(APPEND LINK_LIBS ${ZLIB_LIBRARY}) if(ENABLE_ZSTD) - include_directories(${ZSTD_INCLUDE_DIRS}) + include_directories(${LIBZSTD_INCLUDE_DIRS}) list(APPEND LINK_LIBS ${LIBZSTD_LDFLAGS}) endif() if(ENABLE_CJSON) - include_directories(${CJSON_INCLUDE_DIRS}) + include_directories(${LIBCJSON_INCLUDE_DIRS}) list(APPEND LINK_LIBS ${LIBCJSON_LDFLAGS}) endif()