diff options
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/CheckTypeSize.cmake | 14 | ||||
| -rw-r--r-- | CMake/CurlTests.c | 2 | ||||
| -rw-r--r-- | CMake/OtherTests.cmake | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/CMake/CheckTypeSize.cmake b/CMake/CheckTypeSize.cmake index 9b601946d..e768254d6 100644 --- a/CMake/CheckTypeSize.cmake +++ b/CMake/CheckTypeSize.cmake @@ -11,11 +11,11 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE) if(NOT DEFINED ${VARIABLE}) if("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") set(CHECK_TYPE_SIZE_TYPE "${TYPE}") - set(MACRO_CHECK_TYPE_SIZE_FLAGS + set(MACRO_CHECK_TYPE_SIZE_FLAGS "${CMAKE_REQUIRED_FLAGS}") foreach(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H) if("${def}") - set(MACRO_CHECK_TYPE_SIZE_FLAGS + set(MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}") endif("${def}") endforeach(def) @@ -25,14 +25,14 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE) endforeach(def) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckTypeSize.c.in" - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY) - file(READ + file(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" CHECK_TYPE_SIZE_FILE_CONTENT) message(STATUS "Check size of ${TYPE}") if(CMAKE_REQUIRED_LIBRARIES) - set(CHECK_TYPE_SIZE_ADD_LIBRARIES + set(CHECK_TYPE_SIZE_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") endif(CMAKE_REQUIRED_LIBRARIES) try_run(${VARIABLE} HAVE_${VARIABLE} @@ -43,11 +43,11 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE) OUTPUT_VARIABLE OUTPUT) if(HAVE_${VARIABLE}) message(STATUS "Check size of ${TYPE} - done") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n") else(HAVE_${VARIABLE}) message(STATUS "Check size of ${TYPE} - failed") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\nCheckTypeSize.c:\n${CHECK_TYPE_SIZE_FILE_CONTENT}\n\n") endif(HAVE_${VARIABLE}) endif("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c index 91a754c86..a3851a5f1 100644 --- a/CMake/CurlTests.c +++ b/CMake/CurlTests.c @@ -1,6 +1,6 @@ #ifdef TIME_WITH_SYS_TIME /* Time with sys/time test */ - + #include <sys/types.h> #include <sys/time.h> #include <time.h> diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake index 50fa67559..89d004844 100644 --- a/CMake/OtherTests.cmake +++ b/CMake/OtherTests.cmake @@ -68,7 +68,7 @@ if(curl_cv_recv) endforeach(recv_arg3) endforeach(recv_arg2) endforeach(recv_arg1) - endforeach(recv_retv) + endforeach(recv_retv) else(NOT DEFINED curl_cv_func_recv_args OR "${curl_cv_func_recv_args}" STREQUAL "unknown") string(REGEX REPLACE "^([^,]*),[^,]*,[^,]*,[^,]*,[^,]*$" "\\1" RECV_TYPE_ARG1 "${curl_cv_func_recv_args}") string(REGEX REPLACE "^[^,]*,([^,]*),[^,]*,[^,]*,[^,]*$" "\\1" RECV_TYPE_ARG2 "${curl_cv_func_recv_args}") @@ -81,7 +81,7 @@ if(curl_cv_recv) #MESSAGE("RECV_TYPE_ARG4 ${RECV_TYPE_ARG4}") #MESSAGE("RECV_TYPE_RETV ${RECV_TYPE_RETV}") endif(NOT DEFINED curl_cv_func_recv_args OR "${curl_cv_func_recv_args}" STREQUAL "unknown") - + if("${curl_cv_func_recv_args}" STREQUAL "unknown") message(FATAL_ERROR "Cannot find proper types to use for recv args") endif("${curl_cv_func_recv_args}" STREQUAL "unknown") @@ -134,7 +134,7 @@ if(curl_cv_send) endforeach(send_arg3) endforeach(send_arg2) endforeach(send_arg1) - endforeach(send_retv) + endforeach(send_retv) else(NOT DEFINED curl_cv_func_send_args OR "${curl_cv_func_send_args}" STREQUAL "unknown") string(REGEX REPLACE "^([^,]*),[^,]*,[^,]*,[^,]*,[^,]*,[^,]*$" "\\1" SEND_TYPE_ARG1 "${curl_cv_func_send_args}") string(REGEX REPLACE "^[^,]*,([^,]*),[^,]*,[^,]*,[^,]*,[^,]*$" "\\1" SEND_TYPE_ARG2 "${curl_cv_func_send_args}") @@ -149,7 +149,7 @@ if(curl_cv_send) #MESSAGE("SEND_TYPE_RETV ${SEND_TYPE_RETV}") #MESSAGE("SEND_QUAL_ARG2 ${SEND_QUAL_ARG2}") endif(NOT DEFINED curl_cv_func_send_args OR "${curl_cv_func_send_args}" STREQUAL "unknown") - + if("${curl_cv_func_send_args}" STREQUAL "unknown") message(FATAL_ERROR "Cannot find proper types to use for send args") endif("${curl_cv_func_send_args}" STREQUAL "unknown") |