STYLE: remove debug output, fix indentation

the tests run again successfully, but since CheckTypeSize will switch to a
TRY_COMPILE soon I will look at it again after this change

Alex

2 files changed, 57 insertions, 54 deletions

diff --git a/Modules/CMakeCCompilerId.c b/Modules/CMakeCCompilerId.c
index 18f0b8f..a29c6a0 100644
--- a/Modules/CMakeCCompilerId.c
+++ b/Modules/CMakeCCompilerId.c
@@ -41,9 +41,14 @@
 
 /* sdcc, the small devices C compiler for embedded systems, 
    http://sdcc.sourceforge.net 
-   Beside this id not supported yet by CMake */
+   Beside this id not supported yet by CMake 
+   Unfortunately this doesn't work because SDCC (and other embedded compilers 
+   too) produce not binary files, but e.g. Intel hex files by default. 
+   This also means it has a different suffix (.ihx) so the file isn't even
+   found. */
+/*
 #elif defined(SDCC)
-# define COMPILER_ID "SDCC"
+# define COMPILER_ID "SDCC" */
 
 #elif defined(_COMPILER_VERSION)
 # define COMPILER_ID "MIPSpro"
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index eaffe7d..a4869a6 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -15,58 +15,56 @@
 MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
   SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
   IF(NOT DEFINED ${VARIABLE})
-  IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-    SET(CHECK_TYPE_SIZE_TYPE "${TYPE}")
-    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 
-          "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
-      ENDIF("${def}")
-    ENDFOREACH(def)
-    SET(CHECK_TYPE_SIZE_PREINCLUDE)
-    SET(CHECK_TYPE_SIZE_PREMAIN)
-    FOREACH(def ${CMAKE_EXTRA_INCLUDE_FILES})
-      SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")
-    ENDFOREACH(def)
-    CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CheckTypeSize.c.in"
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY)
-    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 
-        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-    ELSE(CMAKE_REQUIRED_LIBRARIES)
-      SET(CHECK_TYPE_SIZE_ADD_LIBRARIES)
-    ENDIF(CMAKE_REQUIRED_LIBRARIES)
-    IF(CMAKE_REQUIRED_INCLUDES)
-      SET(CHECK_TYPE_SIZE_ADD_INCLUDES
-        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
-    ELSE(CMAKE_REQUIRED_INCLUDES)
-      SET(CHECK_TYPE_SIZE_ADD_INCLUDES)
-    ENDIF(CMAKE_REQUIRED_INCLUDES)
-    TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c"
-      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
-      "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
-      "${CHECK_TYPE_SIZE_ADD_INCLUDES}"
-      OUTPUT_VARIABLE OUTPUT)
-      
-      message(STATUS "debug: COMPILE: ${HAVE_${VARIABLE}} RUN: ${${VARIABLE}} OUT: ${OUTPUT}")
-    IF(HAVE_${VARIABLE})
-      MESSAGE(STATUS "Check size of ${TYPE} - done")
-      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 
-        "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}$")
+    IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+      SET(CHECK_TYPE_SIZE_TYPE "${TYPE}")
+      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 
+            "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
+        ENDIF("${def}")
+      ENDFOREACH(def)
+      SET(CHECK_TYPE_SIZE_PREINCLUDE)
+      SET(CHECK_TYPE_SIZE_PREMAIN)
+      FOREACH(def ${CMAKE_EXTRA_INCLUDE_FILES})
+        SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")
+      ENDFOREACH(def)
+      CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CheckTypeSize.c.in"
+        "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY)
+      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 
+          "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+      ELSE(CMAKE_REQUIRED_LIBRARIES)
+        SET(CHECK_TYPE_SIZE_ADD_LIBRARIES)
+      ENDIF(CMAKE_REQUIRED_LIBRARIES)
+      IF(CMAKE_REQUIRED_INCLUDES)
+        SET(CHECK_TYPE_SIZE_ADD_INCLUDES
+          "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+      ELSE(CMAKE_REQUIRED_INCLUDES)
+        SET(CHECK_TYPE_SIZE_ADD_INCLUDES)
+      ENDIF(CMAKE_REQUIRED_INCLUDES)
+      TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
+        ${CMAKE_BINARY_DIR}
+        "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c"
+        COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+        CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
+        "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
+        "${CHECK_TYPE_SIZE_ADD_INCLUDES}"
+        OUTPUT_VARIABLE OUTPUT)
+      IF(HAVE_${VARIABLE})
+        MESSAGE(STATUS "Check size of ${TYPE} - done")
+        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 
+          "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}$")
   ENDIF(NOT DEFINED ${VARIABLE})
   SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
 ENDMACRO(CHECK_TYPE_SIZE)