From 8ea0aa5f418b9f09e2d60306960fb9eb7a5bf995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 26 May 2024 23:12:32 +0200 Subject: [PATCH] core, relay: fix include directory of libcjson and libzstd --- ChangeLog.adoc | 1 + src/core/CMakeLists.txt | 4 ++-- src/plugins/relay/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 82cab2ff9..5f5792d90 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -16,6 +16,7 @@ * php: fix return value of function hdata_longlong * tcl: fix return value of function hdata_longlong (issue #2119) +* core, relay: fix include directory of libcjson and libzstd * tests: fix relay tests on s390x (issue #2118) * tests: fix check of php plugin (issue #2117) * tests: fix compilation of tests on Fedora 40 (issue #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()