From 8149dbed29973c2f37dcea0357cdb94ad84ecfb1 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Fri, 8 Aug 2003 11:59:07 -0400 Subject: ENH: Cleanups and add missing CMakeOutput.log and CMakeError.log appending. Close Bug #136 - Verify that all modules that do try compile produce CMakeError.log and CMakeOutput.log --- Modules/CMakeDetermineCCompiler.cmake | 13 ++++++++++--- Modules/CMakeDetermineCXXCompiler.cmake | 13 ++++++++++--- Modules/CMakeDetermineSystem.cmake | 3 +++ Modules/CMakeTestCCompiler.cmake | 6 ++++++ Modules/CMakeTestCXXCompiler.cmake | 6 ++++++ Modules/CMakeVS6FindMake.cmake | 14 +++++++------- Modules/CMakeVS71FindMake.cmake | 14 +++++++------- Modules/CMakeVS7FindMake.cmake | 14 +++++++------- Modules/CheckFunctionExists.cmake | 3 +++ Modules/CheckIncludeFile.cmake | 4 ++++ Modules/CheckIncludeFileCXX.cmake | 4 ++++ Modules/CheckIncludeFiles.cmake | 4 ++++ Modules/CheckLibraryExists.cmake | 4 ++++ Modules/CheckTypeSize.cmake | 2 ++ Modules/CheckVariableExists.cmake | 3 +++ Modules/FindHTMLHelp.cmake | 12 ++++++------ Modules/FindMFC.cmake | 6 +++--- Modules/TestBigEndian.cmake | 34 +++++++++++++++++++++++++-------- Modules/TestCXXAcceptsFlag.cmake | 7 ++++++- Modules/TestForANSIForScope.cmake | 10 ++++++++-- Modules/TestForSTDNamespace.cmake | 6 ++++++ 21 files changed, 135 insertions(+), 47 deletions(-) diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 73cd665..e85b2f0 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -49,9 +49,16 @@ MARK_AS_ADVANCED(CMAKE_RANLIB) # test to see if the c compiler is gnu EXEC_PROGRAM(${CMAKE_C_COMPILER} ARGS -E ${CMAKE_ROOT}/Modules/CMakeTestGNU.c OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT RETURN_VALUE CMAKE_COMPILER_RETURN) IF(NOT CMAKE_COMPILER_RETURN) - IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) - SET(CMAKE_COMPILER_IS_GNUCC 1) - ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) + IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) + SET(CMAKE_COMPILER_IS_GNUCC 1) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the C compiler is GNU succeeded with " + "the following output:\n${CMAKE_COMPILER_OUTPUT}\n\n") + ELSE("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the C compiler is GNU failed with " + "the following output:\n${CMAKE_COMPILER_OUTPUT}\n\n") + ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) ENDIF(NOT CMAKE_COMPILER_RETURN) diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index 57a8326..f5e3c60 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -42,9 +42,16 @@ MARK_AS_ADVANCED(CMAKE_CXX_COMPILER) # test to see if the cxx compiler is gnu EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS -E ${CMAKE_ROOT}/Modules/CMakeTestGNU.c OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT RETURN_VALUE CMAKE_COMPILER_RETURN) IF(NOT CMAKE_COMPILER_RETURN) - IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) - SET(CMAKE_COMPILER_IS_GNUCXX 1) - ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) + IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) + SET(CMAKE_COMPILER_IS_GNUCXX 1) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the C++ compiler is GNU succeeded with " + "the following output:\n${CMAKE_COMPILER_OUTPUT}\n\n") + ELSE("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the C++ compiler is GNU failed with " + "the following output:\n${CMAKE_COMPILER_OUTPUT}\n\n") + ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_GNU.*" ) ENDIF(NOT CMAKE_COMPILER_RETURN) # configure all variables set in this file diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index ef6d408..922a48c 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -62,6 +62,9 @@ IF(CMAKE_SYSTEM_VERSION) ENDIF(CMAKE_SYSTEM_VERSION) +FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "The system is: ${CMAKE_SYSTEM_NAME} - ${CMAKE_SYSTEM_VERSION} - ${CMAKE_SYSTEM_PROCESSOR}\n") + # configure variables set in this file for fast reload CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeSystem.cmake.in ${CMAKE_BINARY_DIR}/CMakeSystem.cmake IMMEDIATE) diff --git a/Modules/CMakeTestCCompiler.cmake b/Modules/CMakeTestCCompiler.cmake index 4e70cf2..d3fa13c 100644 --- a/Modules/CMakeTestCCompiler.cmake +++ b/Modules/CMakeTestCCompiler.cmake @@ -17,6 +17,12 @@ IF(NOT CMAKE_C_COMPILER_WORKS) "is not able to compile a simple test program.\nIt fails " "with the following output:\n ${OUTPUT}\n\n" "CMake will not be able to correctly generate this project.") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "Determining if the C compiler works failed with " + "the following output:\n${OUTPUT}\n\n") ELSE(NOT CMAKE_C_COMPILER_WORKS) MESSAGE(STATUS "Check for working C compiler: ${CMAKE_C_COMPILER} -- works") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the C compiler works passed with " + "the following output:\n${OUTPUT}\n\n") ENDIF(NOT CMAKE_C_COMPILER_WORKS) diff --git a/Modules/CMakeTestCXXCompiler.cmake b/Modules/CMakeTestCXXCompiler.cmake index f7e5a26..dd875da 100644 --- a/Modules/CMakeTestCXXCompiler.cmake +++ b/Modules/CMakeTestCXXCompiler.cmake @@ -16,6 +16,12 @@ IF(NOT CMAKE_CXX_COMPILER_WORKS) "is not able to compile a simple test program.\nIt fails " "with the following output:\n ${OUTPUT}\n\n" "CMake will not be able to correctly generate this project.") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "Determining if the CXX compiler works failed with " + "the following output:\n${OUTPUT}\n\n") ELSE(NOT CMAKE_CXX_COMPILER_WORKS) MESSAGE(STATUS "Check for working CXX compiler: ${CMAKE_CXX_COMPILER} -- works") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the CXX compiler works passed with " + "the following output:\n${OUTPUT}\n\n") ENDIF(NOT CMAKE_CXX_COMPILER_WORKS) diff --git a/Modules/CMakeVS6FindMake.cmake b/Modules/CMakeVS6FindMake.cmake index dedcb0f..f73e272 100644 --- a/Modules/CMakeVS6FindMake.cmake +++ b/Modules/CMakeVS6FindMake.cmake @@ -1,9 +1,9 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM - NAMES msdev - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\6.0\\Setup;VsCommonDir]/MSDev98/Bin - "c:/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" - "c:/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" - "/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" -) + NAMES msdev + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\6.0\\Setup;VsCommonDir]/MSDev98/Bin + "c:/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" + "c:/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" + "/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" + ) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) diff --git a/Modules/CMakeVS71FindMake.cmake b/Modules/CMakeVS71FindMake.cmake index 4555c54..e06e593 100644 --- a/Modules/CMakeVS71FindMake.cmake +++ b/Modules/CMakeVS71FindMake.cmake @@ -1,9 +1,9 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM - NAMES devenv - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VS;EnvironmentDirectory] - "c:/Program Files/Microsoft Visual Studio .NET/Common7/IDE" - "c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE" - "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" -) + NAMES devenv + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VS;EnvironmentDirectory] + "c:/Program Files/Microsoft Visual Studio .NET/Common7/IDE" + "c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE" + "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" + ) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) diff --git a/Modules/CMakeVS7FindMake.cmake b/Modules/CMakeVS7FindMake.cmake index 7d009f6..a9ef85e 100644 --- a/Modules/CMakeVS7FindMake.cmake +++ b/Modules/CMakeVS7FindMake.cmake @@ -1,9 +1,9 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM - NAMES devenv - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.0\\Setup\\VS;EnvironmentDirectory] - "c:/Program Files/Microsoft Visual Studio .NET/Common7/IDE" - "c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE" - "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" -) + NAMES devenv + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.0\\Setup\\VS;EnvironmentDirectory] + "c:/Program Files/Microsoft Visual Studio .NET/Common7/IDE" + "c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE" + "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" + ) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake index 139c669..6836970 100644 --- a/Modules/CheckFunctionExists.cmake +++ b/Modules/CheckFunctionExists.cmake @@ -24,6 +24,9 @@ MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) IF(${VARIABLE}) SET(${VARIABLE} 1 CACHE INTERNAL "Have function ${FUNCTION}") MESSAGE(STATUS "Looking for ${FUNCTION} - found") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the function ${FUNCTION} exists passed with the following output:\n" + "${OUTPUT}\n\n") ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for ${FUNCTION} - not found") SET(${VARIABLE} "" CACHE INTERNAL "Have function ${FUNCTION}") diff --git a/Modules/CheckIncludeFile.cmake b/Modules/CheckIncludeFile.cmake index 5bf1046..4c43081 100644 --- a/Modules/CheckIncludeFile.cmake +++ b/Modules/CheckIncludeFile.cmake @@ -22,6 +22,10 @@ MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE) IF(${VARIABLE}) MESSAGE(STATUS "Looking for ${INCLUDE} - found") SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the include file ${INCLUDE} " + "exists passed with the following output:\n" + "${OUTPUT}\n\n") ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for ${INCLUDE} - not found.") SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}") diff --git a/Modules/CheckIncludeFileCXX.cmake b/Modules/CheckIncludeFileCXX.cmake index a2e1944..2ad5cf1 100644 --- a/Modules/CheckIncludeFileCXX.cmake +++ b/Modules/CheckIncludeFileCXX.cmake @@ -19,6 +19,10 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE) IF(${VARIABLE}) MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- found") SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the include file ${INCLUDE} " + "exists passed with the following output:\n" + "${OUTPUT}\n\n") ELSE(${VARIABLE}) MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- not found") SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}") diff --git a/Modules/CheckIncludeFiles.cmake b/Modules/CheckIncludeFiles.cmake index d054acc..ba2cde0 100644 --- a/Modules/CheckIncludeFiles.cmake +++ b/Modules/CheckIncludeFiles.cmake @@ -29,6 +29,10 @@ MACRO(CHECK_INCLUDE_FILES INCLUDE VARIABLE) IF(${VARIABLE}) MESSAGE(STATUS "Looking for include files ${VARIABLE} - found") SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${VARIABLE}") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if files ${INCLUDE} " + "exist passed with the following output:\n" + "${OUTPUT}\n\n") ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for include files ${VARIABLE} - not found.") SET(${VARIABLE} "" CACHE INTERNAL "Have includes ${VARIABLE}") diff --git a/Modules/CheckLibraryExists.cmake b/Modules/CheckLibraryExists.cmake index 5030ecb..0b70d29 100644 --- a/Modules/CheckLibraryExists.cmake +++ b/Modules/CheckLibraryExists.cmake @@ -28,6 +28,10 @@ MACRO(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE) IF(${VARIABLE}) MESSAGE(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - found") SET(${VARIABLE} 1 CACHE INTERNAL "Have library ${LIBRARY}") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the function ${FUNCTION} exists in the ${LIBRARY} " + "passed with the following output:\n" + "${OUTPUT}\n\n") ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - not found") SET(${VARIABLE} "" CACHE INTERNAL "Have library ${LIBRARY}") diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake index 66467a8..55cef20 100644 --- a/Modules/CheckTypeSize.cmake +++ b/Modules/CheckTypeSize.cmake @@ -31,6 +31,8 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) OUTPUT_VARIABLE OUTPUT) IF(HAVE_${VARIABLE}) MESSAGE(STATUS "Check size of ${TYPE} - done") + FILE(APPEND ${CMAKE_BINARY_DIR}/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}/CMakeError.log diff --git a/Modules/CheckVariableExists.cmake b/Modules/CheckVariableExists.cmake index f7be7f5..165fa7d 100644 --- a/Modules/CheckVariableExists.cmake +++ b/Modules/CheckVariableExists.cmake @@ -23,6 +23,9 @@ MACRO(CHECK_VARIABLE_EXISTS VAR VARIABLE) IF(${VARIABLE}) SET(${VARIABLE} 1 CACHE INTERNAL "Have variable ${VAR}") MESSAGE(STATUS "Looking for ${VARIABLE} - found") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the variable ${VAR} exists passed with the following output:\n" + "${OUTPUT}\n\n") ELSE(${VARIABLE}) SET(${VARIABLE} "" CACHE INTERNAL "Have variable ${VAR}") MESSAGE(STATUS "Looking for ${VARIABLE} - not found") diff --git a/Modules/FindHTMLHelp.cmake b/Modules/FindHTMLHelp.cmake index 4649f0f..cf70330 100644 --- a/Modules/FindHTMLHelp.cmake +++ b/Modules/FindHTMLHelp.cmake @@ -3,7 +3,7 @@ # It defines: # HTML_HELP_COMPILER : full path to the HTML Help Compiler (hhc.exe) # HTML_HELP_INCLUDE_PATH : include path to the HTML Help API (htmlhelp.h) -# HTML_HELP_LIBRARY : full path to the HTML Help library (htmlhelp.lib) +# HTML_HELP_LIBRARY : full path to the HTML Help library (htmlhelp.lib) # IF (WIN32) @@ -12,7 +12,7 @@ IF (WIN32) hhc "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]" "C:/Program Files/HTML Help Workshop" - ) + ) GET_FILENAME_COMPONENT (HTML_HELP_COMPILER_PATH ${HTML_HELP_COMPILER} PATH) @@ -21,19 +21,19 @@ IF (WIN32) "${HTML_HELP_COMPILER_PATH}/include" "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/include" "C:/Program Files/HTML Help Workshop/include" - ) + ) FIND_LIBRARY (HTML_HELP_LIBRARY htmlhelp "${HTML_HELP_COMPILER_PATH}/lib" "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/lib" "C:/Program Files/HTML Help Workshop/lib" - ) + ) MARK_AS_ADVANCED ( HTML_HELP_COMPILER HTML_HELP_INCLUDE_PATH - HTML_HELP_LIBRARY - ) + HTML_HELP_LIBRARY + ) ENDIF (WIN32) diff --git a/Modules/FindMFC.cmake b/Modules/FindMFC.cmake index e453ef0..23d71d6 100644 --- a/Modules/FindMFC.cmake +++ b/Modules/FindMFC.cmake @@ -9,9 +9,9 @@ SET( MFC_FOUND "NO" ) # Add MFC support if win32 and not cygwin and not borland IF( WIN32 ) IF( NOT CYGWIN ) - IF( NOT BORLAND ) - SET( MFC_FOUND "YES" ) - ENDIF( NOT BORLAND ) + IF( NOT BORLAND ) + SET( MFC_FOUND "YES" ) + ENDIF( NOT BORLAND ) ENDIF( NOT CYGWIN ) ENDIF( WIN32 ) diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake index 417e754..3f6d719 100644 --- a/Modules/TestBigEndian.cmake +++ b/Modules/TestBigEndian.cmake @@ -5,12 +5,30 @@ # MACRO(TEST_BIG_ENDIAN VARIABLE) - TRY_RUN(${VARIABLE} HAVE_${VARIABLE} - ${CMAKE_BINARY_DIR} - ${CMAKE_ROOT}/Modules/TestBigEndian.c - OUTPUT_VARIABLE OUTPUT) - IF(NOT HAVE_${VARIABLE}) - FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log - "Determining the endianes of the system failed with the following output:\n${OUTPUT}\n\n") - ENDIF(NOT HAVE_${VARIABLE}) + IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") + TRY_RUN(${VARIABLE} HAVE_${VARIABLE} + ${CMAKE_BINARY_DIR} + ${CMAKE_ROOT}/Modules/TestBigEndian.c + OUTPUT_VARIABLE OUTPUT) + MESSAGE(STATUS "Check if the system is big endian") + IF(HAVE_${VARIABLE}) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "Determining the endianes of the system passed. The system is ") + IF(${VARIABLE}) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "big endian") + MESSAGE(STATUS "Check if the system is big endian - big endian") + ELSE(${VARIABLE}) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "little endian") + MESSAGE(STATUS "Check if the system is big endian - little endian") + ENDIF(${VARIABLE}) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "Test produced following output:\n${OUTPUT}\n\n") + ELSE(HAVE_${VARIABLE}) + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "Determining the endianes of the system failed with the following output:\n${OUTPUT}\n\n") + MESSAGE("Check if the system is big endian - failed") + ENDIF(HAVE_${VARIABLE}) + ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") ENDMACRO(TEST_BIG_ENDIAN) diff --git a/Modules/TestCXXAcceptsFlag.cmake b/Modules/TestCXXAcceptsFlag.cmake index 52a21d2..d559b9a 100644 --- a/Modules/TestCXXAcceptsFlag.cmake +++ b/Modules/TestCXXAcceptsFlag.cmake @@ -15,8 +15,13 @@ MACRO(CHECK_CXX_ACCEPTS_FLAG FLAGS VARIABLE) OUTPUT_VARIABLE OUTPUT) IF(${VARIABLE}) MESSAGE(STATUS "Checking to see if CXX compiler acepts flag ${FLAGS} - yes") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the CXX compiler accepts the flag ${FLAGS} passed with " + "the following output:\n${OUTPUT}\n\n") ELSE(${VARIABLE}) + MESSAGE(STATUS "Checking to see if CXX compiler acepts flag ${FLAGS} - no") FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log - "Determining if the CXX compiler accepts the flag ${FLAGS} failed with the following output:\n${OUTPUT}\n\n") + "Determining if the CXX compiler accepts the flag ${FLAGS} failed with " + "the following output:\n${OUTPUT}\n\n") ENDIF(${VARIABLE}) ENDMACRO(CHECK_CXX_ACCEPTS_FLAG) diff --git a/Modules/TestForANSIForScope.cmake b/Modules/TestForANSIForScope.cmake index 5326f86..a5a4f97 100644 --- a/Modules/TestForANSIForScope.cmake +++ b/Modules/TestForANSIForScope.cmake @@ -11,11 +11,17 @@ IF("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$") IF (CMAKE_ANSI_FOR_SCOPE) MESSAGE(STATUS "Check for ANSI scope - found") SET (CMAKE_NO_ANSI_FOR_SCOPE 0 CACHE INTERNAL - "Does the compiler support ansi for scope.") + "Does the compiler support ansi for scope.") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the CXX compiler understands ansi for scopes passed with " + "the following output:\n${OUTPUT}\n\n") ELSE (CMAKE_ANSI_FOR_SCOPE) MESSAGE(STATUS "Check for ANSI scope - not found") SET (CMAKE_NO_ANSI_FOR_SCOPE 1 CACHE INTERNAL - "Does the compiler support ansi for scope.") + "Does the compiler support ansi for scope.") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "Determining if the CXX compiler understands ansi for scopes failed with " + "the following output:\n${OUTPUT}\n\n") ENDIF (CMAKE_ANSI_FOR_SCOPE) ENDIF("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$") diff --git a/Modules/TestForSTDNamespace.cmake b/Modules/TestForSTDNamespace.cmake index 89dd413..00bfeff 100644 --- a/Modules/TestForSTDNamespace.cmake +++ b/Modules/TestForSTDNamespace.cmake @@ -11,10 +11,16 @@ IF("CMAKE_STD_NAMESPACE" MATCHES "^CMAKE_STD_NAMESPACE$") MESSAGE(STATUS "Check for STD namespace - found") SET (CMAKE_NO_STD_NAMESPACE 0 CACHE INTERNAL "Does the compiler support std::.") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log + "Determining if the CXX compiler has std namespace passed with " + "the following output:\n${OUTPUT}\n\n") ELSE (CMAKE_STD_NAMESPACE) MESSAGE(STATUS "Check for STD namespace - not found") SET (CMAKE_NO_STD_NAMESPACE 1 CACHE INTERNAL "Does the compiler support std::.") + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log + "Determining if the CXX compiler has std namespace failed with " + "the following output:\n${OUTPUT}\n\n") ENDIF (CMAKE_STD_NAMESPACE) ENDIF("CMAKE_STD_NAMESPACE" MATCHES "^CMAKE_STD_NAMESPACE$") -- cgit v0.12