-prepare these two files for moving to cmake

Alex



svn path=/trunk/KDE/kdelibs/; revision=516651

2 files changed, 39 insertions, 34 deletions

diff --git a/modules/CheckPrototypeExists.cmake b/modules/CheckPrototypeExists.cmake
index 1c994ed4..ed0945df 100644
--- a/modules/CheckPrototypeExists.cmake
+++ b/modules/CheckPrototypeExists.cmake
@@ -5,16 +5,22 @@
 #  HEADER - the header(s) where the prototype should be declared
 #  VARIABLE - variable to store the result
 #
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
 
 INCLUDE(CheckCXXSourceCompiles)
 
 MACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
-   set(_INCLUDE_FILES)
-   foreach(it ${_HEADER})
-      set(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
-   endforeach(it)
+   SET(_INCLUDE_FILES)
+   FOREACH(it ${_HEADER})
+      SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
+   ENDFOREACH(it)
 
-   set(_CHECK_PROTO_EXISTS_SOURCE_CODE "
+   SET(_CHECK_PROTO_EXISTS_SOURCE_CODE "
 ${_INCLUDE_FILES}
 int main()
 {
diff --git a/modules/CheckTypeSize.cmake b/modules/CheckTypeSize.cmake
index 10fcfcd7..f907d311 100755
--- a/modules/CheckTypeSize.cmake
+++ b/modules/CheckTypeSize.cmake
@@ -2,41 +2,40 @@
 #  CHECK_TYPE_SIZE(TYPE VARIABLE)

 # Check if the type exists and determine size of type.  if the type

 # exists, the size will be stored to the variable.

-#

 #  VARIABLE - variable to store size if the type exists.

 #  HAVE_${VARIABLE} - does the variable exists or NOT

 

 MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)

-  set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)

-  if("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")

-    set(CHECK_TYPE_SIZE_TYPE "${TYPE}")

-    set(MACRO_CHECK_TYPE_SIZE_FLAGS 

+  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)

+  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 

+    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)

+      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}/CMakeFiles/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY)

     FILE(READ "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c"

       CHECK_TYPE_SIZE_FILE_CONTENT)

-    message(STATUS "Check size of ${TYPE}")

-    if(CMAKE_REQUIRED_LIBRARIES)

-      set(CHECK_TYPE_SIZE_ADD_LIBRARIES 

+    MESSAGE(STATUS "Check size of ${TYPE}")

+    IF(CMAKE_REQUIRED_LIBRARIES)

+      SET(CHECK_TYPE_SIZE_ADD_LIBRARIES 

         "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")

-    endif(CMAKE_REQUIRED_LIBRARIES)

+    ENDIF(CMAKE_REQUIRED_LIBRARIES)

     

-    if(CMAKE_REQUIRED_INCLUDES)

-      set(CHECK_TYPE_SIZE_ADD_INCLUDES

+    IF(CMAKE_REQUIRED_INCLUDES)

+      SET(CHECK_TYPE_SIZE_ADD_INCLUDES

         "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") 

-    endif(CMAKE_REQUIRED_INCLUDES)

+    ENDIF(CMAKE_REQUIRED_INCLUDES)

     

     TRY_RUN(${VARIABLE} HAVE_${VARIABLE}

       ${CMAKE_BINARY_DIR}

@@ -45,15 +44,15 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
       "${CHECK_TYPE_SIZE_ADD_INCLUDES}"

       "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"

       OUTPUT_VARIABLE OUTPUT)

-    if(HAVE_${VARIABLE})

-      message(STATUS "Check size of ${TYPE} - done")

+    IF(HAVE_${VARIABLE})

+      MESSAGE(STATUS "Check size of ${TYPE} - done")

       FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/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")

+    ELSE(HAVE_${VARIABLE})

+      MESSAGE(STATUS "Check size of ${TYPE} - failed")

       FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/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}$")

-  set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )

+    ENDIF(HAVE_${VARIABLE})

+  ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")

+  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )

 ENDMACRO(CHECK_TYPE_SIZE)