diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-11-06 01:32:45 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-11-10 09:09:25 +0100 |
| commit | 17d27805f9e68fb3fa62e1ed817d2b9f44885ee2 (patch) | |
| tree | 335e511d63d30239039297e1a805ed483113203e /lib/CMakeLists.txt | |
| parent | 767aaf587ce93720951d3c081acb4d61d5280755 (diff) | |
| download | curl-17d27805f9e68fb3fa62e1ed817d2b9f44885ee2.tar.gz | |
cmake: add ENABLE_THREADED_RESOLVER, rename ARES
Fix detection of the AsynchDNS feature which not just depends on
pthreads support, but also on whether USE_POSIX_THREADS is set or not.
Caught by test 1014.
This patch adds a new ENABLE_THREADED_RESOLVER option (corresponding to
--enable-threaded-resolver of autotools) which also needs a check for
HAVE_PTHREAD_H.
For symmetry with autotools, CURL_USE_ARES is renamed to ENABLE_ARES
(--enable-ares). Checks that test for the availability actually use
USE_ARES instead as that is the result of whether a-res is available or
not (in practice this does not matter as CARES is marked as required
package, but nevertheless it is better to write the intent).
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'lib/CMakeLists.txt')
| -rw-r--r-- | lib/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 78fde4d8f..e7886ac55 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -57,7 +57,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include) include_directories(${CMAKE_CURRENT_BINARY_DIR}/..) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -if(CURL_USE_ARES) +if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) endif() |