Skip to content

Commit 181ef31

Browse files
committed
Add non-blocking getaddrinfo option to Cmake
Adds Cmake option HTTPLIB_USE_NON_BLOCKING_GETADDRINFO default on. Also adds the HTTPLIB_IS_USING_NON_BLOCKING_GETADDRINFO Ref yhirose#1601, yhirose#2167, and yhirose#1601 (comment)
1 parent 0c08c37 commit 181ef31

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* HTTPLIB_REQUIRE_BROTLI (default off)
1111
* HTTPLIB_REQUIRE_ZSTD (default off)
1212
* HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN (default on)
13+
* HTTPLIB_USE_NON_BLOCKING_GETADDRINFO (default on)
1314
* HTTPLIB_COMPILE (default off)
1415
* HTTPLIB_INSTALL (default on)
1516
* HTTPLIB_TEST (default off)
@@ -49,6 +50,7 @@
4950
* HTTPLIB_IS_USING_BROTLI - a bool for if Brotli support is enabled.
5051
* HTTPLIB_IS_USING_ZSTD - a bool for if ZSTD support is enabled.
5152
* HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN - a bool for if support of loading system certs from the Apple Keychain is enabled.
53+
* HTTPLIB_IS_USING_NON_BLOCKING_GETADDRINFO - a bool for if nonblocking getaddrinfo is enabled.
5254
* HTTPLIB_IS_COMPILED - a bool for if the library is compiled, or otherwise header-only.
5355
* HTTPLIB_INCLUDE_DIR - the root path to httplib's header (e.g. /usr/include).
5456
* HTTPLIB_LIBRARY - the full path to the library if compiled (e.g. /usr/lib/libhttplib.so).
@@ -104,6 +106,7 @@ option(HTTPLIB_TEST "Enables testing and builds tests" OFF)
104106
option(HTTPLIB_REQUIRE_BROTLI "Requires Brotli to be found & linked, or fails build." OFF)
105107
option(HTTPLIB_USE_BROTLI_IF_AVAILABLE "Uses Brotli (if available) to enable Brotli decompression support." ON)
106108
option(HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN "Enable feature to load system certs from the Apple Keychain." ON)
109+
option(HTTPLIB_USE_NON_BLOCKING_GETADDRINFO "Enables the non-blocking alternatives for getaddrinfo." ON)
107110
option(HTTPLIB_REQUIRE_ZSTD "Requires ZSTD to be found & linked, or fails build." OFF)
108111
option(HTTPLIB_USE_ZSTD_IF_AVAILABLE "Uses ZSTD (if available) to enable zstd support." ON)
109112
# Defaults to static library
@@ -117,6 +120,7 @@ endif()
117120
# Set some variables that are used in-tree and while building based on our options
118121
set(HTTPLIB_IS_COMPILED ${HTTPLIB_COMPILE})
119122
set(HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN ${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN})
123+
set(HTTPLIB_IS_USING_NON_BLOCKING_GETADDRINFO ${HTTPLIB_USE_NON_BLOCKING_GETADDRINFO})
120124

121125
# Threads needed for <thread> on some systems, and for <pthread.h> on Linux
122126
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
@@ -269,6 +273,7 @@ target_compile_definitions(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
269273
$<$<BOOL:${HTTPLIB_IS_USING_ZSTD}>:CPPHTTPLIB_ZSTD_SUPPORT>
270274
$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:CPPHTTPLIB_OPENSSL_SUPPORT>
271275
$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN}>>:CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN>
276+
$<$<BOOL:${HTTPLIB_USE_NON_BLOCKING_GETADDRINFO}>:CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO>
272277
)
273278

274279
# CMake configuration files installation directory

cmake/httplibConfig.cmake.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(HTTPLIB_IS_USING_OPENSSL @HTTPLIB_IS_USING_OPENSSL@)
77
set(HTTPLIB_IS_USING_ZLIB @HTTPLIB_IS_USING_ZLIB@)
88
set(HTTPLIB_IS_COMPILED @HTTPLIB_COMPILE@)
99
set(HTTPLIB_IS_USING_BROTLI @HTTPLIB_IS_USING_BROTLI@)
10+
set(HTTPLIB_IS_USING_NON_BLOCKING_GETADDRINFO @HTTPLIB_IS_USING_NON_BLOCKING_GETADDRINFO@)
1011
set(HTTPLIB_VERSION @PROJECT_VERSION@)
1112

1213
include(CMakeFindDependencyMacro)

0 commit comments

Comments
 (0)