diff options
Diffstat (limited to 'CMake/CheckTypeSize.cmake')
| -rw-r--r-- | CMake/CheckTypeSize.cmake | 14 |
1 files changed, 7 insertions, 7 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}$") |