Skip to content

Commit 586aacd

Browse files
authored
make sure resolvers are added when C-Ares is manually disabled (#187)
1 parent 5457061 commit 586aacd

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

CMakeLists.txt

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,26 +131,31 @@ if(OpenSSL_FOUND)
131131
target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENSSL)
132132
endif()
133133

134+
set(HAVE_C-ARES NO)
134135
if (BUILD_C-ARES)
135136
find_package(c-ares)
136137
if(c-ares_FOUND)
137138
message(STATUS "c-ares found!")
138-
target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
139-
set(TRANTOR_SOURCES
140-
${TRANTOR_SOURCES}
141-
trantor/net/inner/AresResolver.cc)
142-
set(private_headers
143-
${private_headers}
144-
trantor/net/inner/AresResolver.h)
145-
else(c-ares_FOUND)
146-
set(TRANTOR_SOURCES
147-
${TRANTOR_SOURCES}
148-
trantor/net/inner/NormalResolver.cc)
149-
set(private_headers
150-
${private_headers}
151-
trantor/net/inner/NormalResolver.h)
152-
endif(c-ares_FOUND)
153-
endif (BUILD_C-ARES)
139+
set(HAVE_C-ARES TRUE)
140+
endif()
141+
endif ()
142+
143+
if(HAVE_C-ARES)
144+
target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
145+
set(TRANTOR_SOURCES
146+
${TRANTOR_SOURCES}
147+
trantor/net/inner/AresResolver.cc)
148+
set(private_headers
149+
${private_headers}
150+
trantor/net/inner/AresResolver.h)
151+
else()
152+
set(TRANTOR_SOURCES
153+
${TRANTOR_SOURCES}
154+
trantor/net/inner/NormalResolver.cc)
155+
set(private_headers
156+
${private_headers}
157+
trantor/net/inner/NormalResolver.h)
158+
endif()
154159

155160
find_package(Threads)
156161
target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)

0 commit comments

Comments
 (0)