diff options
| -rw-r--r-- | Source/CTest/Curl/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | Source/CTest/Curl/config.h.in | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestSubmit.cxx | 2 |
3 files changed, 19 insertions, 8 deletions
diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt index b4e744e..808c33d 100644 --- a/Source/CTest/Curl/CMakeLists.txt +++ b/Source/CTest/Curl/CMakeLists.txt @@ -4,6 +4,10 @@ PROJECT(LIBCURL C) SET(PACKAGE "curl") SET(VERSION "7.10.3") SET(PACKAGE_TARNAME " ") +SET(PACKAGE_BUGREPORT " ") +SET(PACKAGE_NAME " ") +SET(PACKAGE_VERSION " ") +SET(PACKAGE_STRING " ") SET(OPERATING_SYSTEM ${CMAKE_SYSTEM_NAME}) SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}") @@ -125,8 +129,6 @@ CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) CHECK_INCLUDE_FILE("netdb.h" HAVE_NETDB_H) CHECK_INCLUDE_FILE("zlib.h" HAVE_ZLIB_H) CHECK_INCLUDE_FILE("sys/poll.h" HAVE_SYS_POLL_H) -CHECK_INCLUDE_FILE("netinet/in.h" HAVE_NETINET_IN_H) -CHECK_INCLUDE_FILE("sys/socket.h" HAVE_SYS_SOCKET_H) CHECK_INCLUDE_FILE("openssl/x509.h" HAVE_OPENSSL_X509_H) CHECK_INCLUDE_FILE("openssl/engine.h" HAVE_OPENSSL_ENGINE_H) CHECK_INCLUDE_FILE("openssl/rsa.h" HAVE_OPENSSL_RSA_H) @@ -138,6 +140,13 @@ CHECK_INCLUDE_FILE("openssl/err.h" HAVE_OPENSSL_ERR_H) IF(HAVE_SYS_TYPES_H) SET(TEST_NETWORK_INCLUDES ${TEST_NETWORK_INCLUDES} "sys/types.h") ENDIF(HAVE_SYS_TYPES_H) + +CHECK_INCLUDE_FILES("${TEST_NETWORK_INCLUDES};sys/socket.h" HAVE_SYS_SOCKET_H) +IF(HAVE_SYS_SOCKET_H) + SET(TEST_NETWORK_INCLUDES ${TEST_NETWORK_INCLUDES} "sys/socket.h") +ENDIF(HAVE_SYS_SOCKET_H) + +CHECK_INCLUDE_FILES("${TEST_NETWORK_INCLUDES};netinet/in.h" HAVE_NETINET_IN_H) IF(HAVE_SYS_SOCKET_H) SET(TEST_NETWORK_INCLUDES ${TEST_NETWORK_INCLUDES} "sys/socket.h") ENDIF(HAVE_SYS_SOCKET_H) @@ -151,7 +160,11 @@ IF(HAVE_NETINET_IN_H) SET(TEST_NETWORK_INCLUDES ${TEST_NETWORK_INCLUDES} "netinet/in.h") ENDIF(HAVE_NETINET_IN_H) -CHECK_INCLUDE_FILES("${TEST_NETWORK_INCLUDES};netinet/if_ether.h" HAVE_NETINET_IF_ETHER_H) +CHECK_INCLUDE_FILES("${TEST_NETWORK_INCLUDES};netinet/if_ether.h" + HAVE_NETINET_IF_ETHER_H) +CHECK_INCLUDE_FILES("${TEST_NETWORK_INCLUDES};sys/select.h" HAVE_SYS_SELECT_H) + +CHECK_INCLUDE_FILES("${TEST_NETWORK_INCLUDES};utime.h" HAVE_UTIME_H) CHECK_INCLUDE_FILE("netinet/in.h" HAVE_NETINET_IN_H) CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H) @@ -161,7 +174,6 @@ CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H) CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H) CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H) CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H) -CHECK_INCLUDE_FILE("sys/select.h" HAVE_SYS_SELECT_H) CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H) CHECK_INCLUDE_FILE("termios.h" HAVE_TERMIOS_H) @@ -169,7 +181,6 @@ CHECK_INCLUDE_FILE("termio.h" HAVE_TERMIO_H) CHECK_INCLUDE_FILE("io.h" HAVE_IO_H) CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H) CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) -CHECK_INCLUDE_FILE("utime.h" HAVE_UTIME_H) CHECK_INCLUDE_FILE("sys/utime.h" HAVE_SYS_UTIME_H) CHECK_INCLUDE_FILE("winsock.h" HAVE_WINSOCK_H) CHECK_INCLUDE_FILE("sockio.h" HAVE_SOCKIO_H) @@ -377,4 +388,4 @@ IF(CURL_TESTING) ENDIF(CURL_TESTING) ADD_EXECUTABLE(LIBCURL Testing/curltest.c) -TARGET_LINK_LIBRARIES(LIBCURL Curl)
\ No newline at end of file +TARGET_LINK_LIBRARIES(LIBCURL Curl) diff --git a/Source/CTest/Curl/config.h.in b/Source/CTest/Curl/config.h.in index 980b972..0560f0f 100644 --- a/Source/CTest/Curl/config.h.in +++ b/Source/CTest/Curl/config.h.in @@ -436,7 +436,7 @@ #cmakedefine PACKAGE "${PACKAGE}" /* Define to the address where bug reports for this package should be sent. */ -#cmakedefine PACKAGE_BUGREPORT ${PACKAGE_BUGREPORT} +#cmakedefine PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}" /* Define to the full name of this package. */ #cmakedefine PACKAGE_NAME "${PACKAGE_NAME}" diff --git a/Source/CTest/cmCTestSubmit.cxx b/Source/CTest/cmCTestSubmit.cxx index a26b55a..0494204 100644 --- a/Source/CTest/cmCTestSubmit.cxx +++ b/Source/CTest/cmCTestSubmit.cxx @@ -23,7 +23,7 @@ cmCTestSubmit::cmCTestSubmit() : m_HTTPProxy(), m_FTPProxy() { - std::cout << "Setup proxy" << endl; + std::cout << "Setup proxy" << std::endl; m_HTTPProxy = ""; m_HTTPProxyType = 0; if ( getenv("HTTP_PROXY") ) |