Commit f323e243 authored by Brad King's avatar Brad King
Browse files

ENH: Cleanup output when running CMake

  - Fix CheckFor64BitStreams to not re-check every time
  - Remove status messages from Xdmf2/*/CMakeLists.txt:
     "Finding Atomic Data Sizes"
     "Finding a 64 Bit Integer"
     "Checking for 64 Bit Streams"
    These messages are confusing since they appear every time.
    The CMakeOutput.txt and CMakeError.txt log files should have
    information about these checks when they are performed the
    first time anyway.
parent 1beec635
......@@ -6,7 +6,7 @@
#
MACRO(CHECK_FOR_64BIT_STREAMS VARIABLE)
IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
SET(MACRO_CHECK_FOR_64BIT_STREAMS_FLAGS ${CMAKE_REQUIRED_FLAGS})
IF(CMAKE_NO_ANSI_STREAM_HEADERS)
SET(MACRO_CHECK_FOR_64BIT_STREAMS_FLAGS
......@@ -29,14 +29,14 @@ MACRO(CHECK_FOR_64BIT_STREAMS VARIABLE)
OUTPUT_VARIABLE OUTPUT)
IF(${VARIABLE})
MESSAGE(STATUS "Check if system supports 64 bit streams - yes")
SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}")
SET(${VARIABLE} 1 CACHE INTERNAL "Whether streams support 64-bit types")
ELSE(${VARIABLE})
MESSAGE(STATUS "Check if system supports 64 bit streams - no")
SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}")
SET(${VARIABLE} "" CACHE INTERNAL "Whether streams support 64-bit types")
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Determining if the system supports 64 bit streams "
"failed with the following output:\n"
"${OUTPUT}\n" APPEND)
ENDIF(${VARIABLE})
ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
ENDMACRO(CHECK_FOR_64BIT_STREAMS)
......@@ -14,7 +14,6 @@ SET(ARCH_TO_BUILD ${ICE_SYSTEM} CACHE INTERNAL "Host Arcitecture : Linux IRIXN32
#
ADD_DEFINITIONS(-D${ARCH_TO_BUILD})
MESSAGE(STATUS "Finding Atomic Data Sizes")
SET(ICE_SIZEOF_CHAR ${CMAKE_SIZEOF_CHAR})
SET(ICE_SIZEOF_DOUBLE ${CMAKE_SIZEOF_DOUBLE})
SET(ICE_SIZEOF_FLOAT ${CMAKE_SIZEOF_FLOAT})
......@@ -23,7 +22,6 @@ SET(ICE_SIZEOF_LONG ${CMAKE_SIZEOF_LONG})
SET(ICE_SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT})
INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
MESSAGE(STATUS "Finding a 64 Bit Integer")
IF(WIN32)
CHECK_TYPE_SIZE(__int64 SIZEOF___INT64)
ENDIF(WIN32)
......
......@@ -190,7 +190,6 @@ SET(ARCH_TO_BUILD ${XDMF_SYSTEM} CACHE INTERNAL "Host Arcitecture : Linux IRIXN3
#
ADD_DEFINITIONS(-D${ARCH_TO_BUILD})
MESSAGE(STATUS "Finding Atomic Data Sizes")
SET(XDMF_SIZEOF_CHAR ${CMAKE_SIZEOF_CHAR})
SET(XDMF_SIZEOF_DOUBLE ${CMAKE_SIZEOF_DOUBLE})
SET(XDMF_SIZEOF_FLOAT ${CMAKE_SIZEOF_FLOAT})
......@@ -199,7 +198,6 @@ SET(XDMF_SIZEOF_LONG ${CMAKE_SIZEOF_LONG})
SET(XDMF_SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT})
INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
MESSAGE(STATUS "Finding a 64 Bit Integer")
IF(WIN32)
CHECK_TYPE_SIZE(__int64 SIZEOF___INT64)
ENDIF(WIN32)
......@@ -253,7 +251,6 @@ ENDIF(${XDMF_SIZEOF_INT} MATCHES 4)
INCLUDE(${CMAKE_ROOT}/Modules/TestForANSIStreamHeaders.cmake)
INCLUDE(${Xdmf_SOURCE_DIR}/CMake/CheckFor64BitStreams.cmake)
MESSAGE(STATUS "Checking for 64 Bit Streams")
CHECK_FOR_64BIT_STREAMS(XDMF_HAVE_64BIT_STREAMS)
# Find include files
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment