diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2024-05-26 23:12:32 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2024-05-26 23:13:49 +0200 |
| commit | 5a8751b9eb6bf34ef602a0d81f8d982dffa73143 (patch) | |
| tree | fb9ce5f048d37e2ac3a2830d2c23c648e98ab8e1 | |
| parent | 96f9942aed052b025cce2c1251019d68c1bff3d3 (diff) | |
| download | weechat-5a8751b9eb6bf34ef602a0d81f8d982dffa73143.zip | |
core, relay: fix include directory of libcjson and libzstd
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/relay/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 4 deletions
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() |