From d1f036c424a52eec67ec6f548cecd462a3f12dcc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Jun 2025 20:10:55 +0200 Subject: [PATCH] cmake: configure c-ares header directory in project root (was: lib) The c-ares header directory was added to the header path within `lib`, as opposed to every other dependency which added them in the root `CMakeLists.txt`. Such exception is no longer necessary. This patch aligns c-ares header setup with the rest of dependencies. And also with autotools, which also makes no exception here. Cherry-picked from #17705 Cherry-picked from #16973 Closes #17707 --- CMakeLists.txt | 1 + lib/CMakeLists.txt | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index addc38fa3a..a20d19a8d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -373,6 +373,7 @@ if(ENABLE_ARES) list(APPEND CURL_LIBS ${CARES_LIBRARIES}) list(APPEND CURL_LIBDIRS ${CARES_LIBRARY_DIRS}) list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${CARES_PC_REQUIRES}) + include_directories(SYSTEM ${CARES_INCLUDE_DIRS}) link_directories(${CARES_LIBRARY_DIRS}) if(CARES_CFLAGS) string(APPEND CMAKE_C_FLAGS " ${CARES_CFLAGS}") diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d369d4eaf3..8f158c3892 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -41,10 +41,6 @@ set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" ) -if(USE_ARES) - include_directories(SYSTEM ${CARES_INCLUDE_DIRS}) -endif() - if(CURL_BUILD_TESTING) # special libcurlu library just for unittests add_library(curlu STATIC EXCLUDE_FROM_ALL ${HHEADERS} ${CSOURCES}) -- 2.47.3