|
|
@@ -139,7 +139,7 @@ ENDIF(WIN32)
|
|
|
# does, it appends library to the list.
|
|
|
SET(CURL_LIBS "")
|
|
|
MACRO(CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE)
|
|
|
- CHECK_LIBRARY_EXISTS("${LIBRARY};${CURL_LIBS}" ${SYMBOL} ""
|
|
|
+ CHECK_LIBRARY_EXISTS("${LIBRARY};${CURL_LIBS}" ${SYMBOL} ""
|
|
|
${VARIABLE})
|
|
|
IF(${VARIABLE})
|
|
|
SET(CURL_LIBS ${CURL_LIBS} ${LIBRARY})
|
|
|
@@ -180,7 +180,7 @@ IF(CMAKE_USE_OPENSSL)
|
|
|
SET(USE_SSLEAY TRUE)
|
|
|
SET(USE_OPENSSL TRUE)
|
|
|
IF(WIN32)
|
|
|
- FIND_PATH(SSLINCLUDE openssl/crypto.h
|
|
|
+ FIND_PATH(SSLINCLUDE openssl/crypto.h
|
|
|
PATHS c:/hoffman/Tools/openssl_w32vc6-0.9.8g/inc32)
|
|
|
INCLUDE_DIRECTORIES(${SSLINCLUDE})
|
|
|
FIND_LIBRARY(LIBEAY NAMES libeay32)
|
|
|
@@ -221,7 +221,7 @@ IF(HAVE_FEATURES_H)
|
|
|
getenv.c
|
|
|
hash.c
|
|
|
http.c
|
|
|
- if2ip.c
|
|
|
+ if2ip.c
|
|
|
mprintf.c
|
|
|
multi.c
|
|
|
sendf.c
|
|
|
@@ -287,9 +287,9 @@ ENDIF(NOT CURL_SPECIAL_LIBZ)
|
|
|
CHECK_INCLUDE_FILE_CONCAT("sys/socket.h" HAVE_SYS_SOCKET_H)
|
|
|
CHECK_INCLUDE_FILE_CONCAT("netinet/in.h" HAVE_NETINET_IN_H)
|
|
|
CHECK_INCLUDE_FILE_CONCAT("net/if.h" HAVE_NET_IF_H)
|
|
|
-CHECK_INCLUDE_FILE_CONCAT("netinet/if_ether.h"
|
|
|
+CHECK_INCLUDE_FILE_CONCAT("netinet/if_ether.h"
|
|
|
HAVE_NETINET_IF_ETHER_H)
|
|
|
-CHECK_INCLUDE_FILE_CONCAT("netinet/tcp.h"
|
|
|
+CHECK_INCLUDE_FILE_CONCAT("netinet/tcp.h"
|
|
|
HAVE_NETINET_TCP_H)
|
|
|
CHECK_INCLUDE_FILE_CONCAT("sys/select.h" HAVE_SYS_SELECT_H)
|
|
|
CHECK_INCLUDE_FILE_CONCAT("utime.h" HAVE_UTIME_H)
|
|
|
@@ -421,7 +421,7 @@ IF(CMAKE_USE_OPENSSL)
|
|
|
CHECK_SYMBOL_EXISTS(RAND_status "${CURL_INCLUDES}" HAVE_RAND_STATUS)
|
|
|
CHECK_SYMBOL_EXISTS(RAND_screen "${CURL_INCLUDES}" HAVE_RAND_SCREEN)
|
|
|
CHECK_SYMBOL_EXISTS(RAND_egd "${CURL_INCLUDES}" HAVE_RAND_EGD)
|
|
|
- CHECK_SYMBOL_EXISTS(CRYPTO_cleanup_all_ex_data "${CURL_INCLUDES}"
|
|
|
+ CHECK_SYMBOL_EXISTS(CRYPTO_cleanup_all_ex_data "${CURL_INCLUDES}"
|
|
|
HAVE_CRYPTO_CLEANUP_ALL_EX_DATA)
|
|
|
ENDIF(CMAKE_USE_OPENSSL)
|
|
|
CHECK_SYMBOL_EXISTS(gmtime_r "${CURL_INCLUDES}" HAVE_GMTIME_R)
|
|
|
@@ -485,7 +485,7 @@ ENDIF(NOT HAVE_SIGSETJMP)
|
|
|
# For other curl specific tests, use this macro.
|
|
|
MACRO(CURL_INTERNAL_TEST CURL_TEST)
|
|
|
IF("${CURL_TEST}" MATCHES "^${CURL_TEST}$")
|
|
|
- SET(MACRO_CHECK_FUNCTION_DEFINITIONS
|
|
|
+ SET(MACRO_CHECK_FUNCTION_DEFINITIONS
|
|
|
"-D${CURL_TEST} ${CMAKE_REQUIRED_FLAGS}")
|
|
|
IF(CMAKE_REQUIRED_LIBRARIES)
|
|
|
SET(CURL_TEST_ADD_LIBRARIES
|
|
|
@@ -502,18 +502,18 @@ MACRO(CURL_INTERNAL_TEST CURL_TEST)
|
|
|
IF(${CURL_TEST})
|
|
|
SET(${CURL_TEST} 1 CACHE INTERNAL "Curl test ${FUNCTION}")
|
|
|
MESSAGE(STATUS "Performing Curl Test ${CURL_TEST} - Success")
|
|
|
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
|
|
|
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
|
|
|
"Performing Curl Test ${CURL_TEST} passed with the following output:\n"
|
|
|
"${OUTPUT}\n")
|
|
|
ELSE(${CURL_TEST})
|
|
|
MESSAGE(STATUS "Performing Curl Test ${CURL_TEST} - Failed")
|
|
|
SET(${CURL_TEST} "" CACHE INTERNAL "Curl test ${FUNCTION}")
|
|
|
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
|
|
|
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
|
|
|
"Performing Curl Test ${CURL_TEST} failed with the following output:\n"
|
|
|
"${OUTPUT}\n")
|
|
|
ENDIF(${CURL_TEST})
|
|
|
ENDIF("${CURL_TEST}" MATCHES "^${CURL_TEST}$")
|
|
|
-ENDMACRO(CURL_INTERNAL_TEST)
|
|
|
+ENDMACRO(CURL_INTERNAL_TEST)
|
|
|
|
|
|
# Do curl specific tests
|
|
|
#OPTION(CURL_HAVE_DISABLED_NONBLOCKING "Disable non-blocking socket detection" OFF)
|
|
|
@@ -527,7 +527,7 @@ IF(NOT CURL_HAVE_DISABLED_NONBLOCKING)
|
|
|
HAVE_SO_NONBLOCK
|
|
|
)
|
|
|
ENDIF(NOT CURL_HAVE_DISABLED_NONBLOCKING)
|
|
|
-FOREACH(CURL_TEST
|
|
|
+FOREACH(CURL_TEST
|
|
|
${CURL_NONBLOCKING_TESTS}
|
|
|
TIME_WITH_SYS_TIME
|
|
|
HAVE_O_NONBLOCKHAVE_GETHOSTBYADDR_R_5
|
|
|
@@ -627,12 +627,12 @@ SET(CMAKE_REQUIRED_FLAGS)
|
|
|
|
|
|
# Check for nonblocking
|
|
|
SET(HAVE_DISABLED_NONBLOCKING 1)
|
|
|
-IF(HAVE_FIONBIO OR
|
|
|
+IF(HAVE_FIONBIO OR
|
|
|
HAVE_IOCTLSOCKET OR
|
|
|
HAVE_IOCTLSOCKET_CASE OR
|
|
|
HAVE_O_NONBLOCK)
|
|
|
SET(HAVE_DISABLED_NONBLOCKING)
|
|
|
-ENDIF(HAVE_FIONBIO OR
|
|
|
+ENDIF(HAVE_FIONBIO OR
|
|
|
HAVE_IOCTLSOCKET OR
|
|
|
HAVE_IOCTLSOCKET_CASE OR
|
|
|
HAVE_O_NONBLOCK)
|