From ce8bbc196f12ebcfc180e9ab546e9a395afceb88 Mon Sep 17 00:00:00 2001 From: marty1885 Date: Tue, 26 Oct 2021 08:37:21 +0800 Subject: [PATCH] make sure resolvers are added when C-Ares is manually disabled --- CMakeLists.txt | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49872ef..ade3fe3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,26 +131,31 @@ if(OpenSSL_FOUND) target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENSSL) endif() +set(HAVE_C-ARES NO) if (BUILD_C-ARES) find_package(c-ares) if(c-ares_FOUND) message(STATUS "c-ares found!") - target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) - set(TRANTOR_SOURCES - ${TRANTOR_SOURCES} - trantor/net/inner/AresResolver.cc) - set(private_headers - ${private_headers} - trantor/net/inner/AresResolver.h) - else(c-ares_FOUND) - set(TRANTOR_SOURCES - ${TRANTOR_SOURCES} - trantor/net/inner/NormalResolver.cc) - set(private_headers - ${private_headers} - trantor/net/inner/NormalResolver.h) - endif(c-ares_FOUND) -endif (BUILD_C-ARES) + set(HAVE_C-ARES TRUE) + endif() +endif () + +if(HAVE_C-ARES) + target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) + set(TRANTOR_SOURCES + ${TRANTOR_SOURCES} + trantor/net/inner/AresResolver.cc) + set(private_headers + ${private_headers} + trantor/net/inner/AresResolver.h) +else() + set(TRANTOR_SOURCES + ${TRANTOR_SOURCES} + trantor/net/inner/NormalResolver.cc) + set(private_headers + ${private_headers} + trantor/net/inner/NormalResolver.h) +endif() find_package(Threads) target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)