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 /tests | |
| parent | 767aaf587ce93720951d3c081acb4d61d5280755 (diff) | |
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 'tests')
| -rw-r--r-- | tests/libtest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/server/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index ef73e553e..cc9d7e1f8 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -9,7 +9,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" ) - if(CURL_USE_ARES) + if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) endif() diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 031d81711..00f5242f9 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -9,7 +9,7 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" ) - if(CURL_USE_ARES) + if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) endif() |