diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-03-16 18:26:36 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-03-16 18:26:36 (GMT) |
| commit | 3768961a667634c6f5d5dec22157241bb317f760 (patch) | |
| tree | 728d3ea09cf9b6b6c876e86a84a4a1ac8c999ef7 /Source/CTest/Curl | |
| parent | d224858e1f19ccd1c5d250aee0e8c7e7ec2ece47 (diff) | |
| download | CMake-3768961a667634c6f5d5dec22157241bb317f760.zip CMake-3768961a667634c6f5d5dec22157241bb317f760.tar.gz CMake-3768961a667634c6f5d5dec22157241bb317f760.tar.bz2 | |
COMP: More cleanups
Diffstat (limited to 'Source/CTest/Curl')
| -rw-r--r-- | Source/CTest/Curl/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | Source/CTest/Curl/urldata.h | 1 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt index b169a6c..b8491c2 100644 --- a/Source/CTest/Curl/CMakeLists.txt +++ b/Source/CTest/Curl/CMakeLists.txt @@ -124,13 +124,6 @@ MACRO(CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE) ENDIF(${VARIABLE}) ENDMACRO(CHECK_LIBRARY_EXISTS_CONCAT) -IF(CURL_SPECIAL_LIBZ) - SET(CURL_LIBS ${CURL_LIBS} "${CURL_SPECIAL_LIBZ}") - INCLUDE_DIRECTORIES(${CURL_SPECIAL_LIBZ_INCLUDES}) - SET(HAVE_LIBZ 0) - SET(HAVE_ZLIB_H 0) -ENDIF(CURL_SPECIAL_LIBZ) - # Check for all needed libraries CHECK_LIBRARY_EXISTS_CONCAT("dl" dlopen HAVE_LIBDL) CHECK_LIBRARY_EXISTS_CONCAT("ucb" gethostname HAVE_LIBUCB) @@ -160,6 +153,14 @@ CHECK_LIBRARY_EXISTS("${CURL_LIBS}" dlopen "" HAVE_DLOPEN) # For other tests to use the same libraries SET(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBS}) +IF(CURL_SPECIAL_LIBZ) + SET(CURL_LIBS ${CURL_LIBS} "${CURL_SPECIAL_LIBZ}") + INCLUDE_DIRECTORIES(${CURL_SPECIAL_LIBZ_INCLUDES}) + SET(HAVE_LIBZ 0) + SET(HAVE_ZLIB_H 0) +ENDIF(CURL_SPECIAL_LIBZ) + + # If we have features.h, then do the _BSD_SOURCE magic CHECK_INCLUDE_FILE("features.h" HAVE_FEATURES_H) IF(HAVE_FEATURES_H) diff --git a/Source/CTest/Curl/urldata.h b/Source/CTest/Curl/urldata.h index 144cba3..07aff9b 100644 --- a/Source/CTest/Curl/urldata.h +++ b/Source/CTest/Curl/urldata.h @@ -78,7 +78,6 @@ #include "timeval.h" #ifdef HAVE_ZLIB_H -#error goo #include <zlib.h> /* for content-encoding */ #endif |