minor cleanups: indenting, adding newline to end of file, etc.

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

37 files changed, 484 insertions, 482 deletions

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 74816f2f..9c5f4952 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -5,7 +5,7 @@ file(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake")
 install_files(/share/apps/cmake/modules FILES  kde3init_dummy.cpp.in  kde4init_dummy.cpp.in ${cmakeFiles} )
 
 # the files listed here will be removed by remove_obsoleted_cmake_files.cmake, Alex
-set (FILES_TO_REMOVE
+set(FILES_TO_REMOVE
    ${CMAKE_INSTALL_PREFIX}/share/apps/cmake/modules/FindKDE4.cmake
    )
 # files to remove once we depend on the cmake release:
@@ -20,6 +20,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remove_files.cmake.in ${CMAKE_CURRENT
 install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake )
 
 #file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "#generated by cmake, dont edit\n\n")
-#foreach( _current_FILE ${FILES_TO_REMOVE})
+#foreach ( _current_FILE ${FILES_TO_REMOVE})
 #   file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "exec_program( ${CMAKE_COMMAND} ARGS -E remove ${_current_FILE} )
-#endforeach( _current_FILE)
+#endforeach ( _current_FILE)
diff --git a/modules/CheckPrototypeExists.cmake b/modules/CheckPrototypeExists.cmake
index ed0945df..da319f13 100644
--- a/modules/CheckPrototypeExists.cmake
+++ b/modules/CheckPrototypeExists.cmake
@@ -14,11 +14,11 @@
 
 INCLUDE(CheckCXXSourceCompiles)
 
-MACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
+MACRO (CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
    SET(_INCLUDE_FILES)
-   FOREACH(it ${_HEADER})
+   FOREACH (it ${_HEADER})
       SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
-   ENDFOREACH(it)
+   ENDFOREACH (it)
 
    SET(_CHECK_PROTO_EXISTS_SOURCE_CODE "
 ${_INCLUDE_FILES}
@@ -31,5 +31,5 @@ int main()
 }
 ")
    CHECK_CXX_SOURCE_COMPILES("${_CHECK_PROTO_EXISTS_SOURCE_CODE}" ${_RESULT})
-ENDMACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
+ENDMACRO (CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
 
diff --git a/modules/CheckTypeSize.cmake b/modules/CheckTypeSize.cmake
index f907d311..87de1a76 100755
--- a/modules/CheckTypeSize.cmake
+++ b/modules/CheckTypeSize.cmake
@@ -1,58 +1,58 @@
-# - Check sizeof a type

-#  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 

-      "${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}/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 

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

-    ENDIF(CMAKE_REQUIRED_LIBRARIES)

-    

-    IF(CMAKE_REQUIRED_INCLUDES)

-      SET(CHECK_TYPE_SIZE_ADD_INCLUDES

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

-    ENDIF(CMAKE_REQUIRED_INCLUDES)

-    

-    TRY_RUN(${VARIABLE} HAVE_${VARIABLE}

-      ${CMAKE_BINARY_DIR}

-      "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c"

-      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}

-      "${CHECK_TYPE_SIZE_ADD_INCLUDES}"

-      "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"

-      OUTPUT_VARIABLE OUTPUT)

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

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

-ENDMACRO(CHECK_TYPE_SIZE)

+# - Check sizeof a type
+#  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 
+      "${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}/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 
+        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+    ENDIF (CMAKE_REQUIRED_LIBRARIES)
+    
+    IF (CMAKE_REQUIRED_INCLUDES)
+      SET(CHECK_TYPE_SIZE_ADD_INCLUDES
+        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") 
+    ENDIF (CMAKE_REQUIRED_INCLUDES)
+    
+    TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
+      ${CMAKE_BINARY_DIR}
+      "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c"
+      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
+      "${CHECK_TYPE_SIZE_ADD_INCLUDES}"
+      "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
+      OUTPUT_VARIABLE OUTPUT)
+    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")
+      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 )
+ENDMACRO (CHECK_TYPE_SIZE)
diff --git a/modules/FindACL.cmake b/modules/FindACL.cmake
index d8d83e53..ada94c32 100644
--- a/modules/FindACL.cmake
+++ b/modules/FindACL.cmake
@@ -11,11 +11,11 @@ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H)
 check_include_files(sys/acl.h HAVE_SYS_ACL_H)
 check_include_files(acl/libacl.h HAVE_ACL_LIBACL_H)
 
-if(HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIBACL_H)
+if (HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIBACL_H)
    set(ACL_HEADERS_FOUND TRUE)
-endif(HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIBACL_H)
+endif (HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIBACL_H)
 
-if(ACL_HEADERS_FOUND)
+if (ACL_HEADERS_FOUND)
    FIND_LIBRARY(ACL_LIBS NAMES acl
       PATHS
       /usr/lib
@@ -27,13 +27,13 @@ if(ACL_HEADERS_FOUND)
       /usr/lib
       /usr/local/lib
    )	   
-endif(ACL_HEADERS_FOUND)
+endif (ACL_HEADERS_FOUND)
 
-if(ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS)
+if (ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS)
    set(ACL_FOUND TRUE)
    set(ACL_LIBS ${ACL_LIBS} ${ATTR_LIBS})
    message(STATUS "Found ACL support: ${ACL_LIBS}")
-endif(ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS)
+endif (ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS)
 
 MARK_AS_ADVANCED(ACL_LIBS)
 
diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake
index 18b39654..2e92ad31 100644
--- a/modules/FindAGG.cmake
+++ b/modules/FindAGG.cmake
@@ -29,18 +29,18 @@ FIND_LIBRARY(AGG_LIBRARIES NAMES agg
   /usr/local/lib
 )
 
-if(AGG_INCLUDE_DIR AND AGG_LIBRARIES)
+if (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
    set(AGG_FOUND TRUE)
-endif(AGG_INCLUDE_DIR AND AGG_LIBRARIES)
+endif (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
 
-if(AGG_FOUND)
-  if(NOT AGG_FIND_QUIETLY)
+if (AGG_FOUND)
+  if (NOT AGG_FIND_QUIETLY)
     message(STATUS "Found AGG: ${AGG_LIBRARIES}")
-  endif(NOT AGG_FIND_QUIETLY)
-else(AGG_FOUND)
-  if(AGG_FIND_REQUIRED)
+  endif (NOT AGG_FIND_QUIETLY)
+else (AGG_FOUND)
+  if (AGG_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find AGG")
-  endif(AGG_FIND_REQUIRED)
-endif(AGG_FOUND)
+  endif (AGG_FIND_REQUIRED)
+endif (AGG_FOUND)
 
 MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARIES)
diff --git a/modules/FindASPELL.cmake b/modules/FindASPELL.cmake
index 855f55c7..9d856c60 100644
--- a/modules/FindASPELL.cmake
+++ b/modules/FindASPELL.cmake
@@ -19,18 +19,18 @@ FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15
   /usr/local/lib
 )
 
-if(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
+if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
    set(ASPELL_FOUND TRUE)
-endif(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
+endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
 
-if(ASPELL_FOUND)
-  if(NOT ASPELL_FIND_QUIETLY)
+if (ASPELL_FOUND)
+  if (NOT ASPELL_FIND_QUIETLY)
     message(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}")
-  endif(NOT ASPELL_FIND_QUIETLY)
-else(ASPELL_FOUND)
-  if(ASPELL_FIND_REQUIRED)
+  endif (NOT ASPELL_FIND_QUIETLY)
+else (ASPELL_FOUND)
+  if (ASPELL_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find ASPELL")
-  endif(ASPELL_FIND_REQUIRED)
-endif(ASPELL_FOUND)
+  endif (ASPELL_FIND_REQUIRED)
+endif (ASPELL_FOUND)
 
 MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES)
diff --git a/modules/FindAkode.cmake b/modules/FindAkode.cmake
index a90fdc0b..47efe871 100644
--- a/modules/FindAkode.cmake
+++ b/modules/FindAkode.cmake
@@ -15,18 +15,18 @@ set(AKODE_LIBRARIES)
 set(AKODE_INCLUDE_DIR)
 
 # if akode-config has been found
-IF(AKODECONFIG_EXECUTABLE)
+IF (AKODECONFIG_EXECUTABLE)
 
   EXEC_PROGRAM(${AKODECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE AKODE_LIBRARIES)
 
   EXEC_PROGRAM(${AKODECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE AKODE_INCLUDE_DIR)
 
-  IF(AKODE_LIBRARIES AND AKODE_INCLUDE_DIR)
+  IF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR)
     SET(AKODE_FOUND TRUE)
     STRING(REGEX REPLACE "-I(.+)" "\\1" AKODE_INCLUDE_DIR "${AKODE_INCLUDE_DIR}")
     message(STATUS "Found aKode: ${AKODE_LIBRARIES}")
-  ENDIF(AKODE_LIBRARIES AND AKODE_INCLUDE_DIR)
+  ENDIF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR)
 
   MARK_AS_ADVANCED(AKODE_INCLUDE_DIR AKODE_LIBRARIES)
 
-ENDIF(AKODECONFIG_EXECUTABLE)
+ENDIF (AKODECONFIG_EXECUTABLE)
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index 4a6fae71..3bcc1748 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -22,20 +22,20 @@ FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2
   ${GNUWIN32_DIR}/lib
 )
 
-if(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
    set(BZIP2_FOUND TRUE)
    INCLUDE(CheckLibraryExists)
    CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
-endif(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
 
-if(BZIP2_FOUND)
-  if(NOT BZip2_FIND_QUIETLY)
+if (BZIP2_FOUND)
+  if (NOT BZip2_FIND_QUIETLY)
     message(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
-  endif(NOT BZip2_FIND_QUIETLY)
-else(BZIP2_FOUND)
-  if(BZip2_FIND_REQUIRED)
+  endif (NOT BZip2_FIND_QUIETLY)
+else (BZIP2_FOUND)
+  if (BZip2_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find BZip2")
-  endif(BZip2_FIND_REQUIRED)
-endif(BZIP2_FOUND)
+  endif (BZip2_FIND_REQUIRED)
+endif (BZIP2_FOUND)
 
 MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
diff --git a/modules/FindCarbon.cmake b/modules/FindCarbon.cmake
index f2fa376b..94e81509 100644
--- a/modules/FindCarbon.cmake
+++ b/modules/FindCarbon.cmake
@@ -2,7 +2,7 @@ INCLUDE(CMakeFindFrameworks)
 
 CMAKE_FIND_FRAMEWORKS(Carbon)
 
-if(Carbon_FRAMEWORKS)
-	set (CARBON_LIBRARY "-framework Carbon" CACHE FILEPATH "Carbon framework" FORCE)
-	set (CARBON_FOUND 1)
-endif(Carbon_FRAMEWORKS)
+if (Carbon_FRAMEWORKS)
+   set(CARBON_LIBRARY "-framework Carbon" CACHE FILEPATH "Carbon framework" FORCE)
+   set(CARBON_FOUND 1)
+endif (Carbon_FRAMEWORKS)
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake
index 4d069336..cf2c46be 100644
--- a/modules/FindCups.cmake
+++ b/modules/FindCups.cmake
@@ -19,18 +19,18 @@ FIND_LIBRARY(CUPS_LIBRARIES NAMES cups
   /usr/local/lib
 )
 
-if(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
+if (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
    set(CUPS_FOUND TRUE)
-endif(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
+endif (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
 
-if(CUPS_FOUND)
-  if(NOT Cups_FIND_QUIETLY)
+if (CUPS_FOUND)
+  if (NOT Cups_FIND_QUIETLY)
     message(STATUS "Found Cups: ${CUPS_LIBRARIES}")
-  endif(NOT Cups_FIND_QUIETLY)
-else(CUPS_FOUND)
-  if(Cups_FIND_REQUIRED)
+  endif (NOT Cups_FIND_QUIETLY)
+else (CUPS_FOUND)
+  if (Cups_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find Cups")
-  endif(Cups_FIND_REQUIRED)
-endif(CUPS_FOUND)
+  endif (Cups_FIND_REQUIRED)
+endif (CUPS_FOUND)
 
 MARK_AS_ADVANCED(CUPS_INCLUDE_DIR CUPS_LIBRARIES)
diff --git a/modules/FindDNSSD.cmake b/modules/FindDNSSD.cmake
index cf6c5a0b..56b2f7f5 100644
--- a/modules/FindDNSSD.cmake
+++ b/modules/FindDNSSD.cmake
@@ -20,18 +20,18 @@ FIND_LIBRARY(DNSSD_LIBRARIES NAMES dns_sd
   /usr/local/lib
 )
 
-if(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
+if (DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
    set(DNSSD_FOUND TRUE)
-endif(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
+endif (DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
 
-if(DNSSD_FOUND)
-  if(NOT DNSSD_FIND_QUIETLY)
+if (DNSSD_FOUND)
+  if (NOT DNSSD_FIND_QUIETLY)
     message(STATUS "Found DNSSD: ${DNSSD_LIBRARIES}")
-  endif(NOT DNSSD_FIND_QUIETLY)
-else(DNSSD_FOUND)
-  if(DNSSD_FIND_REQUIRED)
+  endif (NOT DNSSD_FIND_QUIETLY)
+else (DNSSD_FOUND)
+  if (DNSSD_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find DNSSD")
-  endif(DNSSD_FIND_REQUIRED)
-endif(DNSSD_FOUND)
+  endif (DNSSD_FIND_REQUIRED)
+endif (DNSSD_FOUND)
 
 MARK_AS_ADVANCED(DNSSD_INCLUDE_DIR DNSSD_LIBRARIES)
diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake
index 225a2e29..164841c8 100644
--- a/modules/FindFAM.cmake
+++ b/modules/FindFAM.cmake
@@ -17,20 +17,20 @@ FIND_LIBRARY(FAM_LIBRARIES NAMES fam
 )
 
 
-if(FAM_INCLUDE_DIR AND FAM_LIBRARIES)
+if (FAM_INCLUDE_DIR AND FAM_LIBRARIES)
    set(FAM_FOUND TRUE)
-endif(FAM_INCLUDE_DIR AND FAM_LIBRARIES)
+endif (FAM_INCLUDE_DIR AND FAM_LIBRARIES)
 
 
-if(FAM_FOUND)
-   if(NOT FAM_FIND_QUIETLY)
+if (FAM_FOUND)
+   if (NOT FAM_FIND_QUIETLY)
       message(STATUS "Found fam: ${FAM_LIBRARIES}")
-   endif(NOT FAM_FIND_QUIETLY)
-else(FAM_FOUND)
-   if(FAM_FIND_REQUIRED)
+   endif (NOT FAM_FIND_QUIETLY)
+else (FAM_FOUND)
+   if (FAM_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find fam library")
-   endif(FAM_FIND_REQUIRED)
-endif(FAM_FOUND)
+   endif (FAM_FIND_REQUIRED)
+endif (FAM_FOUND)
 
 MARK_AS_ADVANCED(FAM_INCLUDE_DIR FAM_LIBRARIES)
 
diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake
index b7bb1b8b..f8b40d48 100644
--- a/modules/FindGIF.cmake
+++ b/modules/FindGIF.cmake
@@ -22,18 +22,18 @@ FIND_LIBRARY(GIF_LIBRARIES NAMES gif libgif ungif libungif giflib
  ${GNUWIN32_DIR}/lib
 )
 
-if(GIF_INCLUDE_DIR AND GIF_LIBRARIES)
+if (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
    set(GIF_FOUND TRUE)
-endif(GIF_INCLUDE_DIR AND GIF_LIBRARIES)
+endif (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
 
-if(GIF_FOUND)
-  if(NOT GIF_FIND_QUIETLY)
+if (GIF_FOUND)
+  if (NOT GIF_FIND_QUIETLY)
     message(STATUS "Found GIF: ${GIF_LIBRARIES}")
-  endif(NOT GIF_FIND_QUIETLY)
-else(GIF_FOUND)
-  if(GIF_FIND_REQUIRED)
+  endif (NOT GIF_FIND_QUIETLY)
+else (GIF_FOUND)
+  if (GIF_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find GIF")
-  endif(GIF_FIND_REQUIRED)
-endif(GIF_FOUND)
+  endif (GIF_FIND_REQUIRED)
+endif (GIF_FOUND)
 
 MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES)
diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake
index 11a11672..ebd27bba 100644
--- a/modules/FindGNUWIN32.cmake
+++ b/modules/FindGNUWIN32.cmake
@@ -9,24 +9,24 @@ FIND_FILE(GNUWIN32_DIR GNUWIN32
    "C:/"
 )
 
-if(GNUWIN32_DIRECTORY)
+if (GNUWIN32_DIRECTORY)
    set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
    set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
    set(GNUWIN32_BINARY_DIR  ${GNUWIN32_DIR}/bin)
    set(GNUWIN32_FOUND TRUE)
-else(GNUWIN32_DIRECTORY)
+else (GNUWIN32_DIRECTORY)
    set(GNUWIN32_FOUND)
-endif(GNUWIN32_DIRECTORY)
+endif (GNUWIN32_DIRECTORY)
 
-if(GNUWIN32_FOUND)
-  if(NOT GNUWIN32_FIND_QUIETLY)
+if (GNUWIN32_FOUND)
+  if (NOT GNUWIN32_FIND_QUIETLY)
     message(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}")
-  endif(NOT GNUWIN32_FIND_QUIETLY)
-else(GNUWIN32_FOUND)
-  if(GNUWIN32_FIND_REQUIRED)
+  endif (NOT GNUWIN32_FIND_QUIETLY)
+else (GNUWIN32_FOUND)
+  if (GNUWIN32_FIND_REQUIRED)
     message(SEND_ERROR "Could NOT find GNUWIN32")
-  endif(GNUWIN32_FIND_REQUIRED)
-endif(GNUWIN32_FOUND)
+  endif (GNUWIN32_FIND_REQUIRED)
+endif (GNUWIN32_FOUND)
 
 endif (WIN32)
 
diff --git a/modules/FindGettext.cmake b/modules/FindGettext.cmake
index b6dd3de5..2244b742 100644
--- a/modules/FindGettext.cmake
+++ b/modules/FindGettext.cmake
@@ -16,20 +16,20 @@ check_include_files(libintl.h HAVE_LIBINTL_H)
 set(GETTEXT_INCLUDE_DIR)
 set(GETTEXT_LIBRARIES)
 
-if(HAVE_LIBINTL_H)
+if (HAVE_LIBINTL_H)
    set(GETTEXT_FOUND TRUE)
    set(GETTEXT_SOURCE "libintl.h")
-endif(HAVE_LIBINTL_H)
+endif (HAVE_LIBINTL_H)
 
-if(GETTEXT_FOUND)
-   if(NOT Gettext_FIND_QUIETLY)
+if (GETTEXT_FOUND)
+   if (NOT Gettext_FIND_QUIETLY)
       message(STATUS "Gettext functionality present (${GETTEXT_SOURCE})")
-   endif(NOT Gettext_FIND_QUIETLY)
-else(GETTEXT_FOUND)
-   if(NOT Gettext_FIND_QUIETLY)
+   endif (NOT Gettext_FIND_QUIETLY)
+else (GETTEXT_FOUND)
+   if (NOT Gettext_FIND_QUIETLY)
       message(STATUS "Gettext functionality NOT present, "
                      "translations will not be available")
-   endif(NOT Gettext_FIND_QUIETLY)
-endif(GETTEXT_FOUND)
+   endif (NOT Gettext_FIND_QUIETLY)
+endif (GETTEXT_FOUND)
 
 MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR GETTEXT_LIBRARIES)
diff --git a/modules/FindHSPELL.cmake b/modules/FindHSPELL.cmake
index 45475e9a..ba8b21aa 100644
--- a/modules/FindHSPELL.cmake
+++ b/modules/FindHSPELL.cmake
@@ -19,19 +19,19 @@ FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell
   /usr/local/lib
 )
 
-if(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
+if (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
    set(HSPELL_FOUND TRUE)
-endif(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
+endif (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
 
-if(HSPELL_FOUND)
-  if(NOT HSPELL_FIND_QUIETLY)
+if (HSPELL_FOUND)
+  if (NOT HSPELL_FIND_QUIETLY)
     message(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}")
-  endif(NOT HSPELL_FIND_QUIETLY)
-else(HSPELL_FOUND)
-  if(HSPELL_FIND_REQUIRED)
+  endif (NOT HSPELL_FIND_QUIETLY)
+else (HSPELL_FOUND)
+  if (HSPELL_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find HSPELL")
-  endif(HSPELL_FIND_REQUIRED)
-endif(HSPELL_FOUND)
+  endif (HSPELL_FIND_REQUIRED)
+endif (HSPELL_FOUND)
 
 MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES)
 
diff --git a/modules/FindJPEG.cmake b/modules/FindJPEG.cmake
index dfda592c..9113df28 100644
--- a/modules/FindJPEG.cmake
+++ b/modules/FindJPEG.cmake
@@ -31,7 +31,7 @@ IF (JPEG_LIBRARY)
 ENDIF (JPEG_LIBRARY)
 
 # Deprecated declarations.
-SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
+SET(NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
 GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
 
 MARK_AS_ADVANCED(
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
index f5835276..9e876fec 100644
--- a/modules/FindJasper.cmake
+++ b/modules/FindJasper.cmake
@@ -18,20 +18,20 @@ FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper
 
 FIND_PACKAGE(JPEG)
 
-if(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
+if (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
    set(JASPER_FOUND TRUE)
    set(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
-endif(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
+endif (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
 
 
-if(JASPER_FOUND)
-   if(NOT Jasper_FIND_QUIETLY)
+if (JASPER_FOUND)
+   if (NOT Jasper_FIND_QUIETLY)
       message(STATUS "Found jasper: ${JASPER_LIBRARIES}")
-   endif(NOT Jasper_FIND_QUIETLY)
-else(JASPER_FOUND)
-   if(Jasper_FIND_REQUIRED)
+   endif (NOT Jasper_FIND_QUIETLY)
+else (JASPER_FOUND)
+   if (Jasper_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find jasper library")
-   endif(Jasper_FIND_REQUIRED)
-endif(JASPER_FOUND)
+   endif (Jasper_FIND_REQUIRED)
+endif (JASPER_FOUND)
 
 MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES JASPER_LIBRARY)
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index a04495ca..05d278b1 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -36,20 +36,20 @@ FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2
 )
 
 
-if(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
+if (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
    set(LIBART_FOUND TRUE)
-endif(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
+endif (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
 
 
-if(LIBART_FOUND)
-   if(NOT LibArt_FIND_QUIETLY)
+if (LIBART_FOUND)
+   if (NOT LibArt_FIND_QUIETLY)
       message(STATUS "Found libart: ${LIBART_LIBRARIES}")
-   endif(NOT LibArt_FIND_QUIETLY)
-else(LIBART_FOUND)
-   if(LibArt_FIND_REQUIRED)
+   endif (NOT LibArt_FIND_QUIETLY)
+else (LIBART_FOUND)
+   if (LibArt_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find libart")
-   endif(LibArt_FIND_REQUIRED)
-endif(LIBART_FOUND)
+   endif (LibArt_FIND_REQUIRED)
+endif (LIBART_FOUND)
 
 MARK_AS_ADVANCED(LIBART_INCLUDE_DIR LIBART_LIBRARIES)
 
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index c25cc7e2..d6214d76 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -33,18 +33,18 @@ FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
   ${GNUWIN32_DIR}/lib
 )
 
-if(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
    set(LIBXML2_FOUND TRUE)
-endif(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 
-if(LIBXML2_FOUND)
-  if(NOT LibXml2_FIND_QUIETLY)
+if (LIBXML2_FOUND)
+  if (NOT LibXml2_FIND_QUIETLY)
     message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
-  endif(NOT LibXml2_FIND_QUIETLY)
-else(LIBXML2_FOUND)
-  if(LibXml2_FIND_REQUIRED)
+  endif (NOT LibXml2_FIND_QUIETLY)
+else (LIBXML2_FOUND)
+  if (LibXml2_FIND_REQUIRED)
     message(SEND_ERROR "Could NOT find LibXml2")
-  endif(LibXml2_FIND_REQUIRED)
-endif(LIBXML2_FOUND)
+  endif (LibXml2_FIND_REQUIRED)
+endif (LIBXML2_FOUND)
 
-MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
\ No newline at end of file
+MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index 4abb6f9f..be9cd16f 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -33,19 +33,19 @@ FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
   ${GNUWIN32_DIR}/lib
 )
 
-if(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
+if (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
    set(LIBXSLT_FOUND TRUE)
-endif(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
+endif (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 
-if(LIBXSLT_FOUND)
-  if(NOT LibXslt_FIND_QUIETLY)
+if (LIBXSLT_FOUND)
+  if (NOT LibXslt_FIND_QUIETLY)
     message(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}")
-  endif(NOT LibXslt_FIND_QUIETLY)
-else(LIBXSLT_FOUND)
-  if(LibXslt_FIND_REQUIRED)
+  endif (NOT LibXslt_FIND_QUIETLY)
+else (LIBXSLT_FOUND)
+  if (LibXslt_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find LibXslt")
-  endif(LibXslt_FIND_REQUIRED)
-endif(LIBXSLT_FOUND)
+  endif (LibXslt_FIND_REQUIRED)
+endif (LIBXSLT_FOUND)
 
 MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES)
 
diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake
index 80a1445f..db0aa3be 100644
--- a/modules/FindOpenEXR.cmake
+++ b/modules/FindOpenEXR.cmake
@@ -44,11 +44,11 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf
   /usr/local/lib
 )
 
-set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} )
+set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} )
 
 if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY  AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
-   set( OPENEXR_FOUND TRUE)
-   set( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY})
+   set(OPENEXR_FOUND TRUE)
+   set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY})
 endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
 
 
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index 952d4c20..ada33cf0 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -19,20 +19,20 @@ FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32
    ${GNUWIN32_DIR}/lib
 )
 
-if(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
+if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
    set(OPENSSL_FOUND TRUE)
-endif(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
+endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
 
 
-if(OPENSSL_FOUND)
-   if(NOT OpenSSL_FIND_QUIETLY)
+if (OPENSSL_FOUND)
+   if (NOT OpenSSL_FIND_QUIETLY)
       message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
-   endif(NOT OpenSSL_FIND_QUIETLY)
-else(OPENSSL_FOUND)
-   if(OpenSSL_FIND_REQUIRED)
+   endif (NOT OpenSSL_FIND_QUIETLY)
+else (OPENSSL_FOUND)
+   if (OpenSSL_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find OpenSSL")
-   endif(OpenSSL_FIND_REQUIRED)
-endif(OPENSSL_FOUND)
+   endif (OpenSSL_FIND_REQUIRED)
+endif (OPENSSL_FOUND)
 
 MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
 
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index b7935d26..d3a84023 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -34,19 +34,19 @@ FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix
 
 set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
 
-if(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
+if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
    set(PCRE_FOUND TRUE)
-endif(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
+endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
 
 
-if(PCRE_FOUND)
-   if(NOT PCRE_FIND_QUIETLY)
+if (PCRE_FOUND)
+   if (NOT PCRE_FIND_QUIETLY)
       message(STATUS "Found PCRE: ${PCRE_LIBRARIES}")
-   endif(NOT PCRE_FIND_QUIETLY)
-else(PCRE_FOUND)
-   if(PCRE_FIND_REQUIRED)
+   endif (NOT PCRE_FIND_QUIETLY)
+else (PCRE_FOUND)
+   if (PCRE_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find PCRE")
-   endif(PCRE_FIND_REQUIRED)
-endif(PCRE_FOUND)
+   endif (PCRE_FIND_REQUIRED)
+endif (PCRE_FOUND)
 
 MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 533e1ed1..f5b9a7b0 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -119,11 +119,11 @@
 
 set(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 
-set( QT_DEFINITIONS "")
+set(QT_DEFINITIONS "")
 
 if (WIN32)
   set(QT_DEFINITIONS -DQT_DLL)
-endif(WIN32)
+endif (WIN32)
 
 FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/)
 set(GLOB_TEMP_VAR)
@@ -153,24 +153,24 @@ endif (NOT QT_QMAKE_EXECUTABLE)
 if (QT_QMAKE_EXECUTABLE)
    EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION"
       OUTPUT_VARIABLE QTVERSION)
-   if(QTVERSION MATCHES "4.*")
+   if (QTVERSION MATCHES "4.*")
       set(QT4_QMAKE_FOUND TRUE)
-   endif(QTVERSION MATCHES "4.*")
+   endif (QTVERSION MATCHES "4.*")
 endif (QT_QMAKE_EXECUTABLE)
 
-if(QT4_QMAKE_FOUND)
+if (QT4_QMAKE_FOUND)
   # Set QT_LIBRARY_DIR
-  if(NOT QT_LIBRARY_DIR)
-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+  if (NOT QT_LIBRARY_DIR)
+    EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_LIBS"
        OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
-    if(EXISTS "${QT_LIBRARY_DIR_TMP}")
+    if (EXISTS "${QT_LIBRARY_DIR_TMP}")
        set(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
-    else(EXISTS "${QT_LIBRARY_DIR_TMP}")
+    else (EXISTS "${QT_LIBRARY_DIR_TMP}")
        message("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
        message("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
-    endif(EXISTS "${QT_LIBRARY_DIR_TMP}")
-  endif(NOT QT_LIBRARY_DIR)
+    endif (EXISTS "${QT_LIBRARY_DIR_TMP}")
+  endif (NOT QT_LIBRARY_DIR)
 
   if (APPLE)
     if (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
@@ -191,12 +191,12 @@ if(QT4_QMAKE_FOUND)
   ########################################
   if (NOT QT_HEADERS_DIR)
     # Set QT_QTCORE_INCLUDE_DIR by searching for the QtGlobal header
-    if(QT_QMAKE_EXECUTABLE)
-      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+    if (QT_QMAKE_EXECUTABLE)
+      EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
         ARGS "-query QT_INSTALL_HEADERS"
         OUTPUT_VARIABLE qt_headers )
       set(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
-    endif(QT_QMAKE_EXECUTABLE)
+    endif (QT_QMAKE_EXECUTABLE)
   endif (NOT QT_HEADERS_DIR)
   
   FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/include/Qt/)
@@ -204,7 +204,7 @@ if(QT4_QMAKE_FOUND)
   FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/include/Qt/)
   set(QT_PATH_INCLUDE ${GLOB_TEMP_VAR})
   
-  FIND_PATH( QT_QTCORE_INCLUDE_DIR QtGlobal
+  FIND_PATH(QT_QTCORE_INCLUDE_DIR QtGlobal
     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/QtCore"
     ${QT_HEADERS_DIR}/QtCore
     ${QT_LIBRARY_DIR}/QtCore.framework/Headers
@@ -219,23 +219,23 @@ if(QT4_QMAKE_FOUND)
     /usr/include/qt4/QtCore)
 
   # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
-  if( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
+  if (QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
     if (QT_USE_FRAMEWORKS)
       set(QT_INCLUDE_DIR ${QT_HEADERS_DIR})
     else (QT_USE_FRAMEWORKS)
-      STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR})
-      set( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "")
+      STRING(REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR})
+      set(QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "")
     endif (QT_USE_FRAMEWORKS)
-  endif( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
+  endif (QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
   
-  if( NOT QT_INCLUDE_DIR)
-    if( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
-      message( FATAL_ERROR "Could NOT find QtGlobal header")
-    endif( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
-  endif( NOT QT_INCLUDE_DIR)
+  if (NOT QT_INCLUDE_DIR)
+    if (NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find QtGlobal header")
+    endif (NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+  endif (NOT QT_INCLUDE_DIR)
 
 
-  FIND_PATH( QT_DOC_DIR /html/qcoreapplication.html
+  FIND_PATH(QT_DOC_DIR /html/qcoreapplication.html
     ${QT_PATH_INCLUDE}
     $ENV{QTDIR}/doc
     /usr/local/qt/doc
@@ -249,86 +249,86 @@ if(QT4_QMAKE_FOUND)
   endif (QT_USE_FRAMEWORKS)
 
   # Set QT_QT3SUPPORT_INCLUDE_DIR
-  FIND_PATH( QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
+  FIND_PATH(QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
     ${QT_INCLUDE_DIR}/Qt3Support
     ${QT_LIBRARY_DIR}/Qt3Support.framework/Headers
     )
 
   # Set QT_QT_INCLUDE_DIR
-  FIND_PATH( QT_QT_INCLUDE_DIR qglobal.h
+  FIND_PATH(QT_QT_INCLUDE_DIR qglobal.h
     ${QT_INCLUDE_DIR}/Qt
     ${QT_LIBRARY_DIR}/QtCore.framework/Headers
     )
 
   # Set QT_QTGUI_INCLUDE_DIR
-  FIND_PATH( QT_QTGUI_INCLUDE_DIR QtGui
+  FIND_PATH(QT_QTGUI_INCLUDE_DIR QtGui
     ${QT_INCLUDE_DIR}/QtGui
     ${QT_LIBRARY_DIR}/QtGui.framework/Headers
     )
 
   # Set QT_QTSVG_INCLUDE_DIR
-  FIND_PATH( QT_QTSVG_INCLUDE_DIR QtSvg
+  FIND_PATH(QT_QTSVG_INCLUDE_DIR QtSvg
     ${QT_INCLUDE_DIR}/QtSvg
     ${QT_LIBRARY_DIR}/QtSvg.framework/Headers
     )
 
   # Set QT_QTTEST_INCLUDE_DIR
-  FIND_PATH( QT_QTTEST_INCLUDE_DIR QtTest
+  FIND_PATH(QT_QTTEST_INCLUDE_DIR QtTest
     ${QT_INCLUDE_DIR}/QtTest
     ${QT_LIBRARY_DIR}/QtTest.framework/Headers
     )
 
 
   # Set QT_QTMOTIF_INCLUDE_DIR
-  FIND_PATH( QT_QTMOTIF_INCLUDE_DIR QtMotif ${QT_INCLUDE_DIR}/QtMotif)
+  FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif ${QT_INCLUDE_DIR}/QtMotif)
 
   # Set QT_QTNETWORK_INCLUDE_DIR
-  FIND_PATH( QT_QTNETWORK_INCLUDE_DIR QtNetwork
+  FIND_PATH(QT_QTNETWORK_INCLUDE_DIR QtNetwork
     ${QT_INCLUDE_DIR}/QtNetwork
     ${QT_LIBRARY_DIR}/QtNetwork.framework/Headers
     )
 
   # Set QT_QTNSPLUGIN_INCLUDE_DIR
-  FIND_PATH( QT_QTNSPLUGIN_INCLUDE_DIR QtNsPlugin
+  FIND_PATH(QT_QTNSPLUGIN_INCLUDE_DIR QtNsPlugin
     ${QT_INCLUDE_DIR}/QtNsPlugin
     ${QT_LIBRARY_DIR}/QtNsPlugin.framework/Headers
     )
 
   # Set QT_QTOPENGL_INCLUDE_DIR
-  FIND_PATH( QT_QTOPENGL_INCLUDE_DIR QtOpenGL
+  FIND_PATH(QT_QTOPENGL_INCLUDE_DIR QtOpenGL
     ${QT_INCLUDE_DIR}/QtOpenGL
     ${QT_LIBRARY_DIR}/QtOpenGL.framework/Headers
     )
 
   # Set QT_QTSQL_INCLUDE_DIR
-  FIND_PATH( QT_QTSQL_INCLUDE_DIR QtSql
+  FIND_PATH(QT_QTSQL_INCLUDE_DIR QtSql
     ${QT_INCLUDE_DIR}/QtSql
     ${QT_LIBRARY_DIR}/QtSql.framework/Headers
     )
 
   # Set QT_QTXML_INCLUDE_DIR
-  FIND_PATH( QT_QTXML_INCLUDE_DIR QtXml
+  FIND_PATH(QT_QTXML_INCLUDE_DIR QtXml
     ${QT_INCLUDE_DIR}/QtXml
     ${QT_LIBRARY_DIR}/QtXml.framework/Headers
     )
 
   # Set QT_QTASSISTANT_INCLUDE_DIR
-  FIND_PATH( QT_QTASSISTANT_INCLUDE_DIR QtAssistant
+  FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QtAssistant
     ${QT_INCLUDE_DIR}/QtAssistant
     ${QT_HEADERS_DIR}/QtAssistant
     )
 
   # Set QT_QTDESIGNER_INCLUDE_DIR
-  FIND_PATH( QT_QTDESIGNER_INCLUDE_DIR QDesignerComponents
+  FIND_PATH(QT_QTDESIGNER_INCLUDE_DIR QDesignerComponents
     ${QT_INCLUDE_DIR}/QtDesigner
     ${QT_HEADERS_DIR}/QtDesigner
     )
 
   # Make variables changeble to the advanced user
-  MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR )
+  MARK_AS_ADVANCED(QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR )
 
   # Set QT_INCLUDES
-  set( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} )
+  set(QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} )
 
 
   ########################################
@@ -383,7 +383,7 @@ if(QT4_QMAKE_FOUND)
 
     # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore."  as part of
     # the filename
-    FIND_LIBRARY(  QT_QTCORE_LIBRARY
+    FIND_LIBRARY(QT_QTCORE_LIBRARY
       NAMES QtCore QtCore4
       PATHS
       ${QT_LIBRARY_DIR}
@@ -394,11 +394,12 @@ if(QT4_QMAKE_FOUND)
       /usr/lib
       /usr/share/qt4/lib
       C:/Progra~1/qt/lib
-      /usr/lib/qt4 )
+      /usr/lib/qt4
+    )
 
     # Set QT_QTCORE_LIBRARY_DEBUG by searching for a lib with "QtCore_debug"
     # as part of the filename
-    FIND_LIBRARY(  QT_QTCORE_LIBRARY_DEBUG
+    FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG
       NAMES QtCore_debug QtCored4
       PATHS
       ${QT_LIBRARY_DIR}
@@ -409,7 +410,8 @@ if(QT4_QMAKE_FOUND)
       /usr/lib
       /usr/share/qt4/lib
       C:/Progra~1/qt/lib
-      /usr/lib/qt4 )
+      /usr/lib/qt4
+    )
 
     # Set QT_QT3SUPPORT_LIBRARY
     FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY  NAMES Qt3Support Qt3Support4 PATHS ${QT_LIBRARY_DIR})
@@ -467,7 +469,7 @@ if(QT4_QMAKE_FOUND)
   #
   ############################################
 
-  MACRO(_QT4_ADJUST_LIB_VARS basename)
+  MACRO (_QT4_ADJUST_LIB_VARS basename)
     if (QT_${basename}_INCLUDE_DIR)
 
       # if only the release version was found, set the debug variable also to the release version
@@ -490,7 +492,7 @@ if(QT4_QMAKE_FOUND)
 
     # Make variables changeble to the advanced user
     MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_LIBRARY_DEBUG QT_${basename}_INCLUDE_DIR)
-  ENDMACRO(_QT4_ADJUST_LIB_VARS)
+  ENDMACRO (_QT4_ADJUST_LIB_VARS)
 
   _QT4_ADJUST_LIB_VARS(QTCORE)
   _QT4_ADJUST_LIB_VARS(QTGUI)
@@ -513,7 +515,7 @@ if(QT4_QMAKE_FOUND)
   #
   #######################################
   if (NOT QT_BINARY_DIR)
-     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+     EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
         ARGS "-query QT_INSTALL_BINS"
         OUTPUT_VARIABLE qt_bins )
      set(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
@@ -543,7 +545,7 @@ if(QT4_QMAKE_FOUND)
   endif (NOT QT_MOC_EXECUTABLE)
 
   if (QT_MOC_EXECUTABLE)
-     set ( QT_WRAP_CPP "YES")
+     set(QT_WRAP_CPP "YES")
   endif (QT_MOC_EXECUTABLE)
 
   FIND_PROGRAM(QT_UIC3_EXECUTABLE
@@ -582,7 +584,7 @@ if(QT4_QMAKE_FOUND)
   endif (NOT QT_UIC_EXECUTABLE)
 
   if (QT_UIC_EXECUTABLE)
-     set ( QT_WRAP_UI "YES")
+     set(QT_WRAP_UI "YES")
   endif (QT_UIC_EXECUTABLE)
 
   FIND_PROGRAM(QT_RCC_EXECUTABLE
@@ -611,16 +613,16 @@ if(QT4_QMAKE_FOUND)
   #
   ######################################
 
-  MACRO(QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
+  MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
      set(${_moc_INC_DIRS})
      GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
 
-     foreach(_current ${_inc_DIRS})
+     foreach (_current ${_inc_DIRS})
         set(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
-     endforeach(_current ${_inc_DIRS})
-  ENDMACRO(QT4_GET_MOC_INC_DIRS)
+     endforeach (_current ${_inc_DIRS})
+  ENDMACRO (QT4_GET_MOC_INC_DIRS)
 
-  MACRO(QT4_GENERATE_MOC infile outfile )
+  MACRO (QT4_GENERATE_MOC infile outfile )
   # get include dirs
      QT4_GET_MOC_INC_DIRS(moc_includes)
 
@@ -630,17 +632,17 @@ if(QT4_QMAKE_FOUND)
         COMMAND ${QT_MOC_EXECUTABLE}
         ARGS ${moc_includes} -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile})
-  ENDMACRO(QT4_GENERATE_MOC)
+  ENDMACRO (QT4_GENERATE_MOC)
 
 
   # QT4_WRAP_CPP(outfiles inputfile ... )
   # TODO  perhaps add support for -D, -U and other minor options
 
-  MACRO(QT4_WRAP_CPP outfiles )
+  MACRO (QT4_WRAP_CPP outfiles )
     # get include dirs
     QT4_GET_MOC_INC_DIRS(moc_includes)
 
-    FOREACH(it ${ARGN})
+    FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
       GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
 
@@ -650,16 +652,16 @@ if(QT4_QMAKE_FOUND)
         ARGS ${moc_includes} -o ${outfile} ${it}
         MAIN_DEPENDENCY ${it})
       SET(${outfiles} ${${outfiles}} ${outfile})
-    endforeach(it)
+    endforeach (it)
 
-  ENDMACRO(QT4_WRAP_CPP)
+  ENDMACRO (QT4_WRAP_CPP)
 
 
   # QT4_WRAP_UI(outfiles inputfile ... )
 
-  MACRO(QT4_WRAP_UI outfiles )
+  MACRO (QT4_WRAP_UI outfiles )
 
-    FOREACH(it ${ARGN})
+    FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
       SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
@@ -668,16 +670,16 @@ if(QT4_QMAKE_FOUND)
         ARGS -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile})
       SET(${outfiles} ${${outfiles}} ${outfile})
-    ENDFOREACH(it)
+    ENDFOREACH (it)
 
-  ENDMACRO(QT4_WRAP_UI)
+  ENDMACRO (QT4_WRAP_UI)
 
   # QT4_ADD_RESOURCE(outfiles inputfile ... )
   # TODO  perhaps consider adding support for compression and root options to rcc
 
-  MACRO(QT4_ADD_RESOURCES outfiles )
+  MACRO (QT4_ADD_RESOURCES outfiles )
 
-    FOREACH(it ${ARGN})
+    FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
       SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
@@ -686,9 +688,9 @@ if(QT4_QMAKE_FOUND)
         ARGS -name ${outfilename} -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile} )
       SET(${outfiles} ${${outfiles}} ${outfile})
-    ENDFOREACH(it)
+    ENDFOREACH (it)
 
-  ENDMACRO(QT4_ADD_RESOURCES)
+  ENDMACRO (QT4_ADD_RESOURCES)
 
 
 
@@ -698,18 +700,18 @@ if(QT4_QMAKE_FOUND)
   #
   ######################################
   # if the includes,libraries,moc,uic and rcc are found then we have it
-  if( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
-    set( QT4_FOUND "YES" )
-    if( NOT Qt4_FIND_QUIETLY)
+  if (QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+    set(QT4_FOUND "YES" )
+    if (NOT Qt4_FIND_QUIETLY)
       message(STATUS "Found Qt-Version ${QTVERSION}")
 #      message(STATUS "Found Qt-Version ${QT_INST_MAJOR_VERSION}.${QT_INST_MINOR_VERSION}.${QT_INST_PATCH_VERSION}")
-    endif( NOT Qt4_FIND_QUIETLY)
-  else( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
-    set( QT4_FOUND "NO")
-    if( Qt4_FIND_REQUIRED)
-      message( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
-    endif( Qt4_FIND_REQUIRED)
-  endif( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE)
+    endif (NOT Qt4_FIND_QUIETLY)
+  else (QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+    set(QT4_FOUND "NO")
+    if (Qt4_FIND_REQUIRED)
+      message(FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
+    endif (Qt4_FIND_REQUIRED)
+  endif (QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE)
   set(QT_FOUND ${QT4_FOUND})
 
 
@@ -719,11 +721,11 @@ if(QT4_QMAKE_FOUND)
   #
   #######################################
   # for unix add X11 stuff
-  if(UNIX)
+  if (UNIX)
     FIND_PACKAGE(X11)
     FIND_PACKAGE(Threads)
     set(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-  endif(UNIX)
+  endif (UNIX)
 
 
   #######################################
@@ -732,17 +734,17 @@ if(QT4_QMAKE_FOUND)
   #
   #######################################
   # Backwards compatibility for CMake1.4 and 1.2
-  set (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
-  set (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
+  set(QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
+  set(QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
 
-  set( QT_QT_LIBRARY "")
-  set( QT_QTMAIN_LIBRARY "")
-else(QT4_QMAKE_FOUND)
-  if(QT_QMAKE_EXECUTABLE)
+  set(QT_QT_LIBRARY "")
+  set(QT_QTMAIN_LIBRARY "")
+else (QT4_QMAKE_FOUND)
+  if (QT_QMAKE_EXECUTABLE)
     message("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.")
-  endif(QT_QMAKE_EXECUTABLE)
-  if( Qt4_FIND_REQUIRED)
-     message( FATAL_ERROR "Qt qmake NOT found!")
-  endif( Qt4_FIND_REQUIRED)
+  endif (QT_QMAKE_EXECUTABLE)
+  if (Qt4_FIND_REQUIRED)
+     message(FATAL_ERROR "Qt qmake NOT found!")
+  endif (Qt4_FIND_REQUIRED)
 
-endif(QT4_QMAKE_FOUND)
+endif (QT4_QMAKE_FOUND)
diff --git a/modules/FindSasl2.cmake b/modules/FindSasl2.cmake
index 4684735c..4d941806 100644
--- a/modules/FindSasl2.cmake
+++ b/modules/FindSasl2.cmake
@@ -17,16 +17,16 @@ FIND_LIBRARY(SASL2_LIBRARIES NAMES sasl2
 )
 
 
-if(SASL2_INCLUDE_DIR AND SASL2_LIBRARIES)
+if (SASL2_INCLUDE_DIR AND SASL2_LIBRARIES)
    set(SASL2_FOUND TRUE)
-endif(SASL2_INCLUDE_DIR AND SASL2_LIBRARIES)
+endif (SASL2_INCLUDE_DIR AND SASL2_LIBRARIES)
 
 
-if(SASL2_FOUND)
-   if(NOT SASL2_FIND_QUIETLY)
+if (SASL2_FOUND)
+   if (NOT SASL2_FIND_QUIETLY)
       message(STATUS "Found sasl2: ${SASL2_LIBRARIES}")
-   endif(NOT SASL2_FIND_QUIETLY)
-endif(SASL2_FOUND)
+   endif (NOT SASL2_FIND_QUIETLY)
+endif (SASL2_FOUND)
 
 MARK_AS_ADVANCED(SASL2_INCLUDE_DIR SASL2_LIBRARIES)
 
diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake
index 28286f94..d0c13d67 100644
--- a/modules/FindTIFF.cmake
+++ b/modules/FindTIFF.cmake
@@ -1,38 +1,38 @@
-# - Find TIFF library

-# Find the native TIFF includes and library

-# This module defines

-#  TIFF_INCLUDE_DIR, where to find tiff.h, etc.

-#  TIFF_LIBRARIES, libraries to link against to use TIFF.

-#  TIFF_FOUND, If false, do NOT try to use TIFF.

-# also defined, but NOT for general use are

-#  TIFF_LIBRARY, where to find the TIFF library.

-

-FIND_PATH(TIFF_INCLUDE_DIR tiff.h

-  /usr/local/include

-  /usr/include

-)

-

-set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)

-FIND_LIBRARY(TIFF_LIBRARY

-  NAMES ${TIFF_NAMES}

-  PATHS /usr/lib /usr/local/lib

-  )

-

-

-if(TIFF_INCLUDE_DIR AND TIFF_LIBRARY)

-   set(TIFF_FOUND "YES")

-   set(TIFF_LIBRARIES ${TIFF_LIBRARY} )

-endif(TIFF_INCLUDE_DIR AND TIFF_LIBRARY)

-

-

-if (TIFF_FOUND)

-   if (NOT TIFF_FIND_QUIETLY)

-      message(STATUS "Found TIFF: ${TIFF_LIBRARY}")

-   endif (NOT TIFF_FIND_QUIETLY)

-else (TIFF_FOUND)

-   if (TIFF_FIND_REQUIRED)

-      message(FATAL_ERROR "Could NOT find TIFF")

-   endif (TIFF_FIND_REQUIRED)

-endif (TIFF_FOUND)

-

-MARK_AS_ADVANCED( TIFF_INCLUDE_DIR TIFF_LIBRARY )

+# - Find TIFF library
+# Find the native TIFF includes and library
+# This module defines
+#  TIFF_INCLUDE_DIR, where to find tiff.h, etc.
+#  TIFF_LIBRARIES, libraries to link against to use TIFF.
+#  TIFF_FOUND, If false, do NOT try to use TIFF.
+# also defined, but NOT for general use are
+#  TIFF_LIBRARY, where to find the TIFF library.
+
+FIND_PATH(TIFF_INCLUDE_DIR tiff.h
+  /usr/local/include
+  /usr/include
+)
+
+set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
+FIND_LIBRARY(TIFF_LIBRARY
+  NAMES ${TIFF_NAMES}
+  PATHS /usr/lib /usr/local/lib
+)
+
+
+if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+   set(TIFF_FOUND "YES")
+   set(TIFF_LIBRARIES ${TIFF_LIBRARY} )
+endif (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+
+
+if (TIFF_FOUND)
+   if (NOT TIFF_FIND_QUIETLY)
+      message(STATUS "Found TIFF: ${TIFF_LIBRARY}")
+   endif (NOT TIFF_FIND_QUIETLY)
+else (TIFF_FOUND)
+   if (TIFF_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find TIFF")
+   endif (TIFF_FIND_REQUIRED)
+endif (TIFF_FOUND)
+
+MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY )
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake
index 867761b2..9c6b1803 100644
--- a/modules/FindX11.cmake
+++ b/modules/FindX11.cmake
@@ -60,177 +60,177 @@ if (UNIX)
   FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH})
 
-  if(X11_X11_INCLUDE_PATH)
+  if (X11_X11_INCLUDE_PATH)
     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH})
-  endif(X11_X11_INCLUDE_PATH)
+  endif (X11_X11_INCLUDE_PATH)
 
-  if(X11_Xlib_INCLUDE_PATH)
+  if (X11_Xlib_INCLUDE_PATH)
     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH})
- endif(X11_Xlib_INCLUDE_PATH)
+ endif (X11_Xlib_INCLUDE_PATH)
 
-  if(X11_Xutil_INCLUDE_PATH)
+  if (X11_Xutil_INCLUDE_PATH)
     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH})
-  endif(X11_Xutil_INCLUDE_PATH)
+  endif (X11_Xutil_INCLUDE_PATH)
 
-  if(X11_X11_LIB)
+  if (X11_X11_LIB)
     set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB})
-  endif(X11_X11_LIB)
+  endif (X11_X11_LIB)
 
-  if(X11_Xext_LIB)
+  if (X11_Xext_LIB)
     set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB})
-  endif(X11_Xext_LIB)
+  endif (X11_Xext_LIB)
 
-  if(X11_Xau_LIB)
+  if (X11_Xau_LIB)
 	set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB})
 	set(X11_Xau_FOUND TRUE)
-  endif(X11_Xau_LIB)
+  endif (X11_Xau_LIB)
 
-  if(X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB)
+  if (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB)
 	set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB})
 	set(X11_Xdmcp_FOUND TRUE)
-  endif(X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB)
+  endif (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB)
 
-  if(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH)
+  if (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH)
 	set(X11_Xaccess_FOUND TRUE)
 	set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH})
-  endif(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH)
+  endif (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH)
 
-  if(X11_Xcomposite_INCLUDE_PATH)
+  if (X11_Xcomposite_INCLUDE_PATH)
     set(X11_Xcomposite_FOUND TRUE)
-  endif(X11_Xcomposite_INCLUDE_PATH)
+  endif (X11_Xcomposite_INCLUDE_PATH)
 
-  if(X11_XTest_INCLUDE_PATH)
+  if (X11_XTest_INCLUDE_PATH)
     set(X11_XTest_FOUND TRUE)
-  endif(X11_XTest_INCLUDE_PATH)
+  endif (X11_XTest_INCLUDE_PATH)
 
-  if(X11_Xinerama_INCLUDE_PATH)
+  if (X11_Xinerama_INCLUDE_PATH)
     set(X11_Xinerama_FOUND TRUE)
-  endif(X11_Xinerama_INCLUDE_PATH)
+  endif (X11_Xinerama_INCLUDE_PATH)
 
-  if(X11_Xfixes_INCLUDE_PATH)
+  if (X11_Xfixes_INCLUDE_PATH)
     set(X11_Xfixes_FOUND TRUE)
-  endif(X11_Xfixes_INCLUDE_PATH)
+  endif (X11_Xfixes_INCLUDE_PATH)
 
-  if(X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB)
+  if (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB)
     set(X11_Xrender_FOUND TRUE)
-  endif(X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB)
+  endif (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB)
 
-  if(X11_Xrandr_INCLUDE_PATH)
+  if (X11_Xrandr_INCLUDE_PATH)
     set(X11_Xrandr_FOUND TRUE)
-  endif(X11_Xrandr_INCLUDE_PATH)
+  endif (X11_Xrandr_INCLUDE_PATH)
 
-  if(X11_Xxf86misc_INCLUDE_PATH)
+  if (X11_Xxf86misc_INCLUDE_PATH)
     set(X11_Xxf86misc_FOUND TRUE)
-  endif(X11_Xxf86misc_INCLUDE_PATH)
+  endif (X11_Xxf86misc_INCLUDE_PATH)
 
-  if(X11_Xcursor_INCLUDE_PATH)
+  if (X11_Xcursor_INCLUDE_PATH)
     set(X11_Xcursor_FOUND TRUE)
-  endif(X11_Xcursor_INCLUDE_PATH)
+  endif (X11_Xcursor_INCLUDE_PATH)
 
-  if(X11_Xscreensaver_INCLUDE_PATH)
+  if (X11_Xscreensaver_INCLUDE_PATH)
 	set(X11_Xscreensaver_FOUND TRUE)
-  endif(X11_Xscreensaver_INCLUDE_PATH)
+  endif (X11_Xscreensaver_INCLUDE_PATH)
 
-  if(X11_dpms_INCLUDE_PATH)
+  if (X11_dpms_INCLUDE_PATH)
 	set(X11_dpms_FOUND TRUE)
-  endif(X11_dpms_INCLUDE_PATH)
+  endif (X11_dpms_INCLUDE_PATH)
 
-  if( X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH)
+  if (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH)
 	set(X11_Xkb_FOUND TRUE)
-  endif( X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH)
+  endif (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH)
 
-  if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH)
+  if (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH)
     set(X11_kompmgr_FOUND TRUE)
-  endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH)
+  endif (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH)
 
   # Deprecated variable for backwards compatibility with CMake 1.4
-  if(X11_X11_INCLUDE_PATH)
-    if(X11_LIBRARIES)
+  if (X11_X11_INCLUDE_PATH)
+    if (X11_LIBRARIES)
       set(X11_FOUND 1)
-    endif(X11_LIBRARIES)
-  endif(X11_X11_INCLUDE_PATH)
+    endif (X11_LIBRARIES)
+  endif (X11_X11_INCLUDE_PATH)
 
   set(X11_LIBRARY_DIR "")
-  if(X11_X11_LIB)
+  if (X11_X11_LIB)
     GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH)
-  endif(X11_X11_LIB)
+  endif (X11_X11_LIB)
 
-  if(X11_FOUND)
+  if (X11_FOUND)
     INCLUDE(CheckFunctionExists)
     INCLUDE(CheckLibraryExists)
 
     # Translated from an autoconf-generated configure script.
     # See libs.m4 in autoconf's m4 directory.
-    if($ENV{ISC} MATCHES "^yes$")
+    if ($ENV{ISC} MATCHES "^yes$")
       set(X11_X_EXTRA_LIBS -lnsl_s -linet)
-    else($ENV{ISC} MATCHES "^yes$")
+    else ($ENV{ISC} MATCHES "^yes$")
       set(X11_X_EXTRA_LIBS "")
 
       # See if XOpenDisplay in X11 works by itself.
       CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO)
-      if(NOT X11_LIB_X11_SOLO)
+      if (NOT X11_LIB_X11_SOLO)
         # Find library needed for dnet_ntoa.
         CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) 
         if (X11_LIB_DNET_HAS_DNET_NTOA)
-          set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet)
+          set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet)
         else (X11_LIB_DNET_HAS_DNET_NTOA)
           CHECK_LIBRARY_EXISTS("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) 
           if (X11_LIB_DNET_STUB_HAS_DNET_NTOA)
-            set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub)
+            set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub)
           endif (X11_LIB_DNET_STUB_HAS_DNET_NTOA)
         endif (X11_LIB_DNET_HAS_DNET_NTOA)
-      endif(NOT X11_LIB_X11_SOLO)
+      endif (NOT X11_LIB_X11_SOLO)
 
       # Find library needed for gethostbyname.
       CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME)
-      if(NOT CMAKE_HAVE_GETHOSTBYNAME)
+      if (NOT CMAKE_HAVE_GETHOSTBYNAME)
         CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) 
         if (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
-          set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl)
+          set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl)
         else (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
           CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) 
           if (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
-            set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd)
+            set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd)
           endif (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
         endif (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
-      endif(NOT CMAKE_HAVE_GETHOSTBYNAME)
+      endif (NOT CMAKE_HAVE_GETHOSTBYNAME)
 
       # Find library needed for connect.
       CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT)
-      if(NOT CMAKE_HAVE_CONNECT)
+      if (NOT CMAKE_HAVE_CONNECT)
         CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) 
         if (CMAKE_LIB_SOCKET_HAS_CONNECT)
-          set (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS})
+          set(X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS})
         endif (CMAKE_LIB_SOCKET_HAS_CONNECT)
-      endif(NOT CMAKE_HAVE_CONNECT)
+      endif (NOT CMAKE_HAVE_CONNECT)
 
       # Find library needed for remove.
       CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE)
-      if(NOT CMAKE_HAVE_REMOVE)
+      if (NOT CMAKE_HAVE_REMOVE)
         CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) 
         if (CMAKE_LIB_POSIX_HAS_REMOVE)
-          set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix)
+          set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix)
         endif (CMAKE_LIB_POSIX_HAS_REMOVE)
-      endif(NOT CMAKE_HAVE_REMOVE)
+      endif (NOT CMAKE_HAVE_REMOVE)
 
       # Find library needed for shmat.
       CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT)
-      if(NOT CMAKE_HAVE_SHMAT)
+      if (NOT CMAKE_HAVE_SHMAT)
         CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) 
         if (CMAKE_LIB_IPS_HAS_SHMAT)
-          set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lipc)
+          set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lipc)
         endif (CMAKE_LIB_IPS_HAS_SHMAT)
-      endif(NOT CMAKE_HAVE_SHMAT)
-    endif($ENV{ISC} MATCHES "^yes$")
+      endif (NOT CMAKE_HAVE_SHMAT)
+    endif ($ENV{ISC} MATCHES "^yes$")
 
     CHECK_LIBRARY_EXISTS("ICE" "IceConnectionNumber" "${X11_LIBRARY_DIR}"
                          CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
-    if(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
-      set (X11_X_PRE_LIBS -lSM -lICE)
-    endif(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
+    if (CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
+      set(X11_X_PRE_LIBS -lSM -lICE)
+    endif (CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
     # Build the final list of libraries.
-    set (X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS})
-  endif(X11_FOUND)
+    set(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS})
+  endif (X11_FOUND)
 
   MARK_AS_ADVANCED(
     X11_X11_INCLUDE_PATH
@@ -270,6 +270,6 @@ if (UNIX)
     X11_Xkb_INCLUDE_PATH
     X11_Xkblib_INCLUDE_PATH
     X11_Xscreensaver_INCLUDE_PATH
-    )
+  )
 
 endif (UNIX)
diff --git a/modules/FindZLIB.cmake b/modules/FindZLIB.cmake
index 777c47ef..1e01a4da 100644
--- a/modules/FindZLIB.cmake
+++ b/modules/FindZLIB.cmake
@@ -1,32 +1,32 @@
 FIND_PACKAGE(GNUWIN32)
 
 FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
-/usr/include
-/usr/local/include
-${GNUWIN32_DIR}/include
+   /usr/include
+   /usr/local/include
+   ${GNUWIN32_DIR}/include
 )
 
 FIND_LIBRARY(ZLIB_LIBRARY NAMES z zlib
 PATHS
-/usr/lib
-/usr/local/lib
-${GNUWIN32_DIR}/lib
+   /usr/lib
+   /usr/local/lib
+   ${GNUWIN32_DIR}/lib
 )
 
 
-IF(ZLIB_INCLUDE_DIR)
+IF (ZLIB_INCLUDE_DIR)
    SET(ZLIB_FOUND TRUE)
-ENDIF(ZLIB_INCLUDE_DIR)
+ENDIF (ZLIB_INCLUDE_DIR)
 
 
-IF(ZLIB_FOUND)
-   IF(NOT ZLIB_FIND_QUIETLY)
+IF (ZLIB_FOUND)
+   IF (NOT ZLIB_FIND_QUIETLY)
       MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}")
-   ENDIF(NOT ZLIB_FIND_QUIETLY)
-ELSE(ZLIB_FOUND)
-   IF(ZLIB_FIND_REQUIRED)
+   ENDIF (NOT ZLIB_FIND_QUIETLY)
+ELSE (ZLIB_FOUND)
+   IF (ZLIB_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find z library")
-   ENDIF(ZLIB_FIND_REQUIRED)
-ENDIF(ZLIB_FOUND)
+   ENDIF (ZLIB_FIND_REQUIRED)
+ENDIF (ZLIB_FOUND)
 
-MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
\ No newline at end of file
+MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
diff --git a/modules/MacroAddFileDependencies.cmake b/modules/MacroAddFileDependencies.cmake
index 0025a13e..13596912 100644
--- a/modules/MacroAddFileDependencies.cmake
+++ b/modules/MacroAddFileDependencies.cmake
@@ -1,7 +1,7 @@
 # - MACRO_ADD_FILE_DEPENDENCIES(<_file> depend_files...)
 # MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
 
-MACRO(MACRO_ADD_FILE_DEPENDENCIES _file)
+MACRO (MACRO_ADD_FILE_DEPENDENCIES _file)
 
    GET_SOURCE_FILE_PROPERTY(_deps ${_file} OBJECT_DEPENDS)
    if (_deps)
@@ -12,4 +12,4 @@ MACRO(MACRO_ADD_FILE_DEPENDENCIES _file)
 
    SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES OBJECT_DEPENDS "${_deps}")
 
-ENDMACRO(MACRO_ADD_FILE_DEPENDENCIES)
+ENDMACRO (MACRO_ADD_FILE_DEPENDENCIES)
diff --git a/modules/MacroAdditionalCleanFiles.cmake b/modules/MacroAdditionalCleanFiles.cmake
index 5f1725ea..0da79c73 100644
--- a/modules/MacroAdditionalCleanFiles.cmake
+++ b/modules/MacroAdditionalCleanFiles.cmake
@@ -1,7 +1,7 @@
 # - MACRO_ADDITIONAL_CLEAN_FILES(files...)
 # MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
 
-MACRO(MACRO_ADDITIONAL_CLEAN_FILES)
+MACRO (MACRO_ADDITIONAL_CLEAN_FILES)
    GET_DIRECTORY_PROPERTY(_tmp_DIR_PROPS ADDITIONAL_MAKE_CLEAN_FILES )
    
    if (_tmp_DIR_PROPS)
@@ -11,5 +11,5 @@ MACRO(MACRO_ADDITIONAL_CLEAN_FILES)
    endif (_tmp_DIR_PROPS)
 
    SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${_tmp_DIR_PROPS}")
-ENDMACRO(MACRO_ADDITIONAL_CLEAN_FILES)
+ENDMACRO (MACRO_ADDITIONAL_CLEAN_FILES)
 
diff --git a/modules/MacroGetenvWinPath.cmake b/modules/MacroGetenvWinPath.cmake
index 6df21e04..b18f7f63 100644
--- a/modules/MacroGetenvWinPath.cmake
+++ b/modules/MacroGetenvWinPath.cmake
@@ -1,5 +1,5 @@
 
-MACRO(MACRO_GETENV_WIN_PATH var name)
+MACRO (MACRO_GETENV_WIN_PATH var name)
    set(${var} $ENV{${name}})
-   STRING( REGEX REPLACE "\\\\" "/" ${var} "${${var}}" )
-ENDMACRO(MACRO_GETENV_WIN_PATH var name)
+   STRING(REGEX REPLACE "\\\\" "/" ${var} "${${var}}")
+ENDMACRO (MACRO_GETENV_WIN_PATH var name)
diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake
index 7da67217..fb953d85 100644
--- a/modules/MacroLibrary.cmake
+++ b/modules/MacroLibrary.cmake
@@ -1,8 +1,8 @@
 # - include MacroLibrary offers a collection of macros which extend the built-in cmake commands
 # OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
 
-INCLUDE (MacroOptionalFindPackage)
-INCLUDE (MacroAdditionalCleanFiles)
-INCLUDE (MacroAddFileDependencies)
-INCLUDE (MacroGetenvWinPath)
+INCLUDE(MacroOptionalFindPackage)
+INCLUDE(MacroAdditionalCleanFiles)
+INCLUDE(MacroAddFileDependencies)
+INCLUDE(MacroGetenvWinPath)
 
diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake
index c7a05cf0..70681312 100644
--- a/modules/MacroOptionalFindPackage.cmake
+++ b/modules/MacroOptionalFindPackage.cmake
@@ -7,7 +7,7 @@
 # The standard <name>_FOUND variables can be used in the same way
 # as when using the normal FIND_PACKAGE()
 
-MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name )
+MACRO (MACRO_OPTIONAL_FIND_PACKAGE _name )
    OPTION(WITH_${_name} "Search for ${_name} package" ON)
    if (WITH_${_name})
       FIND_PACKAGE(${_name} ${ARGN})
@@ -18,5 +18,5 @@ MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name )
       set(${_name}_LIBRARY)
       set(${_name}_LIBRARIES)
    endif (WITH_${_name})
-ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE)
+ENDMACRO (MACRO_OPTIONAL_FIND_PACKAGE)
 
diff --git a/modules/UsePkgConfig.cmake b/modules/UsePkgConfig.cmake
index 4490d2c1..f39ec148 100644
--- a/modules/UsePkgConfig.cmake
+++ b/modules/UsePkgConfig.cmake
@@ -6,9 +6,9 @@
 #      if pkg-config was NOT found or the specified software package doesn't exist, the
 #      variable will be empty when the function returns, otherwise they will contain the respective information
 
-FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
+FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin)
 
-MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
+MACRO (PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
 # reset the variables at the beginning
   SET(${_include_DIR})
   SET(${_link_DIR})
@@ -16,25 +16,25 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
   SET(${_cflags})
 
   # if pkg-config has been found
-  IF(PKGCONFIG_EXECUTABLE)
+  IF (PKGCONFIG_EXECUTABLE)
 
-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
 
     # and if the package of interest also exists for pkg-config, then get the information
-    IF(NOT _return_VALUE)
+    IF (NOT _return_VALUE)
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR})
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR})
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS})
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags})
 
-    ENDIF(NOT _return_VALUE)
+    ENDIF (NOT _return_VALUE)
 
-  ENDIF(PKGCONFIG_EXECUTABLE)
+  ENDIF (PKGCONFIG_EXECUTABLE)
 
-ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
+ENDMACRO (PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
 
 MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake
index a39be0a2..19fb10aa 100644
--- a/modules/kde4uic.cmake
+++ b/modules/kde4uic.cmake
@@ -1,6 +1,6 @@
 
 #using a ui3 file with uic3
-if(KDE3_IMPL)
+if (KDE3_IMPL)
 
   EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
     -nounload -tr tr2i18n
@@ -9,10 +9,10 @@ if(KDE3_IMPL)
     OUTPUT_VARIABLE _uic_CONTENTS
     ERROR_QUIET
   )
-endif(KDE3_IMPL)
+endif (KDE3_IMPL)
 
 
-if(KDE3_HEADER)
+if (KDE3_HEADER)
 
   EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
     -nounload -tr tr2i18n
@@ -21,7 +21,7 @@ if(KDE3_HEADER)
     ERROR_QUIET
   )
    set(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE})
-endif(KDE3_HEADER)
+endif (KDE3_HEADER)
 
 # the kde4 branch
 if (KDE4_HEADER)
diff --git a/modules/remove_files.cmake.in b/modules/remove_files.cmake.in
index 41cfcdb7..8594d5f2 100644
--- a/modules/remove_files.cmake.in
+++ b/modules/remove_files.cmake.in
@@ -1,2 +1,2 @@
 
-exec_program( ${CMAKE_COMMAND} ARGS -E remove ${FILES_TO_REMOVE} )
+exec_program(${CMAKE_COMMAND} ARGS -E remove ${FILES_TO_REMOVE})