Hmm, "NOT" can't be lowercased. I tested before lowercasing that last one, of course...

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

27 files changed, 136 insertions, 135 deletions

diff --git a/modules/CheckTypeSize.cmake b/modules/CheckTypeSize.cmake
index ec1af0ab..10fcfcd7 100755
--- a/modules/CheckTypeSize.cmake
+++ b/modules/CheckTypeSize.cmake
@@ -4,7 +4,7 @@
 # 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

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

 

 MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)

   set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)

diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake
index 2ea1ead5..18b39654 100644
--- a/modules/FindAGG.cmake
+++ b/modules/FindAGG.cmake
@@ -34,12 +34,12 @@ if(AGG_INCLUDE_DIR AND AGG_LIBRARIES)
 endif(AGG_INCLUDE_DIR AND AGG_LIBRARIES)
 
 if(AGG_FOUND)
-  if(not AGG_FIND_QUIETLY)
+  if(NOT AGG_FIND_QUIETLY)
     message(STATUS "Found AGG: ${AGG_LIBRARIES}")
-  endif(not AGG_FIND_QUIETLY)
+  endif(NOT AGG_FIND_QUIETLY)
 else(AGG_FOUND)
   if(AGG_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find AGG")
+    message(FATAL_ERROR "Could NOT find AGG")
   endif(AGG_FIND_REQUIRED)
 endif(AGG_FOUND)
 
diff --git a/modules/FindASPELL.cmake b/modules/FindASPELL.cmake
index f2ca068c..855f55c7 100644
--- a/modules/FindASPELL.cmake
+++ b/modules/FindASPELL.cmake
@@ -24,12 +24,12 @@ if(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
 endif(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
 
 if(ASPELL_FOUND)
-  if(not ASPELL_FIND_QUIETLY)
+  if(NOT ASPELL_FIND_QUIETLY)
     message(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}")
-  endif(not ASPELL_FIND_QUIETLY)
+  endif(NOT ASPELL_FIND_QUIETLY)
 else(ASPELL_FOUND)
   if(ASPELL_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find ASPELL")
+    message(FATAL_ERROR "Could NOT find ASPELL")
   endif(ASPELL_FIND_REQUIRED)
 endif(ASPELL_FOUND)
 
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index 5e9faad9..0dd14f3c 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -27,12 +27,12 @@ if(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
 endif(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
 
 if(BZIP2_FOUND)
-  if(not BZip2_FIND_QUIETLY)
+  if(NOT BZip2_FIND_QUIETLY)
     message(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
-  endif(not BZip2_FIND_QUIETLY)
+  endif(NOT BZip2_FIND_QUIETLY)
 else(BZIP2_FOUND)
   if(BZip2_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find BZip2")
+    message(FATAL_ERROR "Could NOT find BZip2")
   endif(BZip2_FIND_REQUIRED)
 endif(BZIP2_FOUND)
 
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake
index f0689036..4d069336 100644
--- a/modules/FindCups.cmake
+++ b/modules/FindCups.cmake
@@ -24,12 +24,12 @@ if(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
 endif(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
 
 if(CUPS_FOUND)
-  if(not Cups_FIND_QUIETLY)
+  if(NOT Cups_FIND_QUIETLY)
     message(STATUS "Found Cups: ${CUPS_LIBRARIES}")
-  endif(not Cups_FIND_QUIETLY)
+  endif(NOT Cups_FIND_QUIETLY)
 else(CUPS_FOUND)
   if(Cups_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find Cups")
+    message(FATAL_ERROR "Could NOT find Cups")
   endif(Cups_FIND_REQUIRED)
 endif(CUPS_FOUND)
 
diff --git a/modules/FindDNSSD.cmake b/modules/FindDNSSD.cmake
index e13956f1..cf6c5a0b 100644
--- a/modules/FindDNSSD.cmake
+++ b/modules/FindDNSSD.cmake
@@ -25,12 +25,12 @@ if(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
 endif(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
 
 if(DNSSD_FOUND)
-  if(not DNSSD_FIND_QUIETLY)
+  if(NOT DNSSD_FIND_QUIETLY)
     message(STATUS "Found DNSSD: ${DNSSD_LIBRARIES}")
-  endif(not DNSSD_FIND_QUIETLY)
+  endif(NOT DNSSD_FIND_QUIETLY)
 else(DNSSD_FOUND)
   if(DNSSD_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find DNSSD")
+    message(FATAL_ERROR "Could NOT find DNSSD")
   endif(DNSSD_FIND_REQUIRED)
 endif(DNSSD_FOUND)
 
diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake
index b61fc4e7..225a2e29 100644
--- a/modules/FindFAM.cmake
+++ b/modules/FindFAM.cmake
@@ -23,12 +23,12 @@ endif(FAM_INCLUDE_DIR AND FAM_LIBRARIES)
 
 
 if(FAM_FOUND)
-   if(not FAM_FIND_QUIETLY)
+   if(NOT FAM_FIND_QUIETLY)
       message(STATUS "Found fam: ${FAM_LIBRARIES}")
-   endif(not FAM_FIND_QUIETLY)
+   endif(NOT FAM_FIND_QUIETLY)
 else(FAM_FOUND)
    if(FAM_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find fam library")
+      message(FATAL_ERROR "Could NOT find fam library")
    endif(FAM_FIND_REQUIRED)
 endif(FAM_FOUND)
 
diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake
index 6222b0d8..17097160 100644
--- a/modules/FindGIF.cmake
+++ b/modules/FindGIF.cmake
@@ -24,12 +24,12 @@ if(GIF_INCLUDE_DIR AND GIF_LIBRARIES)
 endif(GIF_INCLUDE_DIR AND GIF_LIBRARIES)
 
 if(GIF_FOUND)
-  if(not GIF_FIND_QUIETLY)
+  if(NOT GIF_FIND_QUIETLY)
     message(STATUS "Found GIF: ${GIF_LIBRARIES}")
-  endif(not GIF_FIND_QUIETLY)
+  endif(NOT GIF_FIND_QUIETLY)
 else(GIF_FOUND)
   if(GIF_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find GIF")
+    message(FATAL_ERROR "Could NOT find GIF")
   endif(GIF_FIND_REQUIRED)
 endif(GIF_FOUND)
 
diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake
index d1c2422f..11a11672 100644
--- a/modules/FindGNUWIN32.cmake
+++ b/modules/FindGNUWIN32.cmake
@@ -19,12 +19,12 @@ else(GNUWIN32_DIRECTORY)
 endif(GNUWIN32_DIRECTORY)
 
 if(GNUWIN32_FOUND)
-  if(not GNUWIN32_FIND_QUIETLY)
+  if(NOT GNUWIN32_FIND_QUIETLY)
     message(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}")
-  endif(not GNUWIN32_FIND_QUIETLY)
+  endif(NOT GNUWIN32_FIND_QUIETLY)
 else(GNUWIN32_FOUND)
   if(GNUWIN32_FIND_REQUIRED)
-    message(SEND_ERROR "Could not find GNUWIN32")
+    message(SEND_ERROR "Could NOT find GNUWIN32")
   endif(GNUWIN32_FIND_REQUIRED)
 endif(GNUWIN32_FOUND)
 
diff --git a/modules/FindHSPELL.cmake b/modules/FindHSPELL.cmake
index b0681d43..45475e9a 100644
--- a/modules/FindHSPELL.cmake
+++ b/modules/FindHSPELL.cmake
@@ -24,12 +24,12 @@ if(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
 endif(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
 
 if(HSPELL_FOUND)
-  if(not HSPELL_FIND_QUIETLY)
+  if(NOT HSPELL_FIND_QUIETLY)
     message(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}")
-  endif(not HSPELL_FIND_QUIETLY)
+  endif(NOT HSPELL_FIND_QUIETLY)
 else(HSPELL_FOUND)
   if(HSPELL_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find HSPELL")
+    message(FATAL_ERROR "Could NOT find HSPELL")
   endif(HSPELL_FIND_REQUIRED)
 endif(HSPELL_FOUND)
 
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
index 4de93039..268d71bf 100644
--- a/modules/FindJasper.cmake
+++ b/modules/FindJasper.cmake
@@ -25,12 +25,12 @@ endif(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
 
 
 if(JASPER_FOUND)
-   if(not Jasper_FIND_QUIETLY)
+   if(NOT Jasper_FIND_QUIETLY)
       message(STATUS "Found jasper: ${JASPER_LIBRARIES}")
-   endif(not Jasper_FIND_QUIETLY)
+   endif(NOT Jasper_FIND_QUIETLY)
 else(JASPER_FOUND)
    if(Jasper_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find jasper library")
+      message(FATAL_ERROR "Could NOT find jasper library")
    endif(Jasper_FIND_REQUIRED)
 endif(JASPER_FOUND)
 
diff --git a/modules/FindKDE3.cmake b/modules/FindKDE3.cmake
index 498dffec..828ca056 100644
--- a/modules/FindKDE3.cmake
+++ b/modules/FindKDE3.cmake
@@ -42,7 +42,7 @@ set(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} kdecore)
 #add some KDE specific stuff
 set(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common)
 
-#only on linux, but not e.g. on FreeBSD:
+#only on linux, but NOT e.g. on FreeBSD:
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   set(KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
 endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -143,16 +143,16 @@ MACRO (KDE3_PRINT_RESULTS)
 
 ENDMACRO (KDE3_PRINT_RESULTS)
 
-if (KDE3_FIND_REQUIRED AND not KDE3_FOUND)
+if (KDE3_FIND_REQUIRED AND NOT KDE3_FOUND)
    #bail out if something wasn't found
    KDE3_PRINT_RESULTS()
-   message(FATAL_ERROR "Could not find everything required for compiling KDE 3 programs")
+   message(FATAL_ERROR "Could NOT find everything required for compiling KDE 3 programs")
 
-endif (KDE3_FIND_REQUIRED AND not KDE3_FOUND)
+endif (KDE3_FIND_REQUIRED AND NOT KDE3_FOUND)
 
-if (not KDE3_FIND_QUIETLY)
+if (NOT KDE3_FIND_QUIETLY)
    KDE3_PRINT_RESULTS()
-endif (not KDE3_FIND_QUIETLY)
+endif (NOT KDE3_FIND_QUIETLY)
 
 #add the found Qt and KDE include directories to the current include path
 set(KDE3_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${KDE3_INCLUDE_DIR})
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake
index 6a81de18..9d808f76 100644
--- a/modules/FindKDE4.cmake
+++ b/modules/FindKDE4.cmake
@@ -111,7 +111,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h)
 
 else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h)
 
-  # ... but not otherwise
+  # ... but NOT otherwise
   set( _KDE4_DCOPIDL2CPP_DEP )
   set( _KDE4_KCONFIG_COMPILER_DEP)
 
@@ -178,10 +178,10 @@ endif (WIN32)
 #####################  and now the platform specific stuff  ############################
 
 
-if(UNIX AND not APPLE)
+if(UNIX AND NOT APPLE)
    FIND_PACKAGE(X11 REQUIRED)
    set(_KDE4_PLATFORM_INCLUDE_DIRS ${X11_INCLUDE_DIR} )
-endif(UNIX AND not APPLE)
+endif(UNIX AND NOT APPLE)
 
 
 
@@ -190,7 +190,7 @@ if (WIN32)
 
 
    if(CYGWIN)
-      message(FATAL_ERROR "Support for Cygwin not yet implemented, please edit FindKDE4.cmake to enable it")
+      message(FATAL_ERROR "Support for Cygwin NOT yet implemented, please edit FindKDE4.cmake to enable it")
    endif(CYGWIN)
 
    FIND_PACKAGE(KDEWIN32 REQUIRED)
@@ -211,7 +211,7 @@ if (WIN32)
 endif (WIN32)
 
 
-# only on linux, but not e.g. on FreeBSD:
+# only on linux, but NOT e.g. on FreeBSD:
 if(CMAKE_SYSTEM_NAME MATCHES Linux)
   set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
   set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
@@ -221,7 +221,7 @@ if(CMAKE_SYSTEM_NAME MATCHES Linux)
 endif(CMAKE_SYSTEM_NAME MATCHES Linux)
 
 
-# works on FreeBSD, not tested on NetBSD and OpenBSD
+# works on FreeBSD, NOT tested on NetBSD and OpenBSD
 if(CMAKE_SYSTEM_NAME MATCHES BSD)
   set ( _KDE4_PLATFORM_DEFINITIONS -D_GNU_SOURCE )
   set ( CMAKE_SHARED_LINKER_FLAGS "-avoid-version -lc")
@@ -302,19 +302,19 @@ MACRO (KDE4_PRINT_RESULTS)
 ENDMACRO (KDE4_PRINT_RESULTS)
 
 
-if (KDE4_FIND_REQUIRED AND not KDE4_FOUND)
+if (KDE4_FIND_REQUIRED AND NOT KDE4_FOUND)
    #bail out if something wasn't found
    KDE4_PRINT_RESULTS()
-   message(FATAL_ERROR "Could not find everything required for compiling KDE 4 programs")
-endif (KDE4_FIND_REQUIRED AND not KDE4_FOUND)
+   message(FATAL_ERROR "Could NOT find everything required for compiling KDE 4 programs")
+endif (KDE4_FIND_REQUIRED AND NOT KDE4_FOUND)
 
 
-if (not KDE4_FIND_QUIETLY)
+if (NOT KDE4_FIND_QUIETLY)
    KDE4_PRINT_RESULTS()
-endif (not KDE4_FIND_QUIETLY)
+endif (NOT KDE4_FIND_QUIETLY)
 
 #add the found Qt and KDE include directories to the current include path
 set(KDE4_INCLUDE_DIRS ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${_KDE4_PLATFORM_INCLUDE_DIRS} )
 
-# not used in Qt4: QT_NO_COMPAT, QT_CLEAN_NAMESPACE, QT_THREAD_SUPPORT
+# NOT used in Qt4: QT_NO_COMPAT, QT_CLEAN_NAMESPACE, QT_THREAD_SUPPORT
 set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT3_SUPPORT -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DQT3_SUPPORT_WARNINGS )
diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake
index 0cf90ffd..2c981cc0 100644
--- a/modules/FindKDEWIN32.cmake
+++ b/modules/FindKDEWIN32.cmake
@@ -46,12 +46,12 @@ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR)
 endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR)
 
 if (KDEWIN32_FOUND)
-   if (not KDEWIN32_FIND_QUIETLY)
+   if (NOT KDEWIN32_FIND_QUIETLY)
       message(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}")
-   endif (not KDEWIN32_FIND_QUIETLY)
+   endif (NOT KDEWIN32_FIND_QUIETLY)
 else (KDEWIN32_FOUND)
    if (KDEWIN32_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first")
+      message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease build and install kdelibs/win/ first")
    endif (KDEWIN32_FIND_REQUIRED)
 endif (KDEWIN32_FOUND)
 
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index e0226d6c..a04495ca 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -42,12 +42,12 @@ endif(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
 
 
 if(LIBART_FOUND)
-   if(not LibArt_FIND_QUIETLY)
+   if(NOT LibArt_FIND_QUIETLY)
       message(STATUS "Found libart: ${LIBART_LIBRARIES}")
-   endif(not LibArt_FIND_QUIETLY)
+   endif(NOT LibArt_FIND_QUIETLY)
 else(LIBART_FOUND)
    if(LibArt_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find libart")
+      message(FATAL_ERROR "Could NOT find libart")
    endif(LibArt_FIND_REQUIRED)
 endif(LIBART_FOUND)
 
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index 89737bb6..c25cc7e2 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -38,12 +38,12 @@ if(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 endif(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 
 if(LIBXML2_FOUND)
-  if(not LibXml2_FIND_QUIETLY)
+  if(NOT LibXml2_FIND_QUIETLY)
     message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
-  endif(not LibXml2_FIND_QUIETLY)
+  endif(NOT LibXml2_FIND_QUIETLY)
 else(LIBXML2_FOUND)
   if(LibXml2_FIND_REQUIRED)
-    message(SEND_ERROR "Could not find LibXml2")
+    message(SEND_ERROR "Could NOT find LibXml2")
   endif(LibXml2_FIND_REQUIRED)
 endif(LIBXML2_FOUND)
 
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index 2efe52f2..44d24605 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -34,12 +34,12 @@ if(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 endif(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 
 if(LIBXSLT_FOUND)
-  if(not LibXslt_FIND_QUIETLY)
+  if(NOT LibXslt_FIND_QUIETLY)
     message(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}")
-  endif(not LibXslt_FIND_QUIETLY)
+  endif(NOT LibXslt_FIND_QUIETLY)
 else(LIBXSLT_FOUND)
   if(LibXslt_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find LibXslt")
+    message(FATAL_ERROR "Could NOT find LibXslt")
   endif(LibXslt_FIND_REQUIRED)
 endif(LIBXSLT_FOUND)
 
diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake
index 23ae39a5..5539fa59 100644
--- a/modules/FindOpenEXR.cmake
+++ b/modules/FindOpenEXR.cmake
@@ -58,12 +58,12 @@ endif(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY A
 
 
 if (OPENEXR_FOUND)
-  if (not OpenEXR_FIND_QUIETLY)
+  if (NOT OpenEXR_FIND_QUIETLY)
     message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}")
-  endif (not OpenEXR_FIND_QUIETLY)
+  endif (NOT OpenEXR_FIND_QUIETLY)
 else (OPENEXR_FOUND)
   if (OpenEXR_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find OPENEXR")
+    message(FATAL_ERROR "Could NOT find OPENEXR")
   endif (OpenEXR_FIND_REQUIRED)
 endif (OPENEXR_FOUND)
 
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index 766cbc58..7b9f7d55 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -22,12 +22,12 @@ endif(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
 
 
 if(OPENSSL_FOUND)
-   if(not OpenSSL_FIND_QUIETLY)
+   if(NOT OpenSSL_FIND_QUIETLY)
       message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
-   endif(not OpenSSL_FIND_QUIETLY)
+   endif(NOT OpenSSL_FIND_QUIETLY)
 else(OPENSSL_FOUND)
    if(OpenSSL_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find OpenSSL")
+      message(FATAL_ERROR "Could NOT find OpenSSL")
    endif(OpenSSL_FIND_REQUIRED)
 endif(OPENSSL_FOUND)
 
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index fbca4eb8..b7935d26 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -40,12 +40,12 @@ endif(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
 
 
 if(PCRE_FOUND)
-   if(not PCRE_FIND_QUIETLY)
+   if(NOT PCRE_FIND_QUIETLY)
       message(STATUS "Found PCRE: ${PCRE_LIBRARIES}")
-   endif(not PCRE_FIND_QUIETLY)
+   endif(NOT PCRE_FIND_QUIETLY)
 else(PCRE_FOUND)
    if(PCRE_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find PCRE")
+      message(FATAL_ERROR "Could NOT find PCRE")
    endif(PCRE_FIND_REQUIRED)
 endif(PCRE_FOUND)
 
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 2012c753..4259b648 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -95,7 +95,7 @@
 #  QT_QTSVG_LIBRARY_DEBUG       Fullpath to QtSvg_debug
 #  QT_QTTEST_LIBRARY_DEBUG      Fullpath to QtTest_debug
 #
-# also defined, but not for general use are
+# also defined, but NOT for general use are
 #  QT_MOC_EXECUTABLE          Where to find the moc tool.
 #  QT_UIC_EXECUTABLE          Where to find the uic tool.
 #  QT_UIC3_EXECUTABLE         Where to find the uic3 tool.
@@ -145,9 +145,9 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
   NO_SYSTEM_PATH
 )
 
-if (not QT_QMAKE_EXECUTABLE)
+if (NOT QT_QMAKE_EXECUTABLE)
    FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake)
-endif (not QT_QMAKE_EXECUTABLE)
+endif (NOT QT_QMAKE_EXECUTABLE)
 
 if (QT_QMAKE_EXECUTABLE)
    EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION"
@@ -159,7 +159,7 @@ endif (QT_QMAKE_EXECUTABLE)
 
 if(QT4_QMAKE_FOUND)
   # Set QT_LIBRARY_DIR
-  if(not QT_LIBRARY_DIR)
+  if(NOT QT_LIBRARY_DIR)
     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_LIBS"
        OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
@@ -167,9 +167,9 @@ if(QT4_QMAKE_FOUND)
        set(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
     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.")
+       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(NOT QT_LIBRARY_DIR)
 
   if (APPLE)
     if (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
@@ -188,7 +188,7 @@ if(QT4_QMAKE_FOUND)
   #       Setting the INCLUDE-Variables
   #
   ########################################
-  if (not QT_HEADERS_DIR)
+  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}
@@ -196,7 +196,7 @@ if(QT4_QMAKE_FOUND)
         OUTPUT_VARIABLE qt_headers )
       set(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
     endif(QT_QMAKE_EXECUTABLE)
-  endif (not QT_HEADERS_DIR)
+  endif (NOT QT_HEADERS_DIR)
   
   FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/include/Qt/)
   set(QT_PATH_INCLUDE ${GLOB_TEMP_VAR})
@@ -218,20 +218,20 @@ 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 "")
     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
@@ -337,7 +337,7 @@ if(QT4_QMAKE_FOUND)
   ########################################
 
   if (QT_USE_FRAMEWORKS)
-    # If FIND_LIBRARY found libraries in Apple frameworks, we would not have
+    # If FIND_LIBRARY found libraries in Apple frameworks, we would NOT have
     # to jump through these hoops.
     set(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore"
        CACHE STRING "The QtCore library.")
@@ -470,14 +470,14 @@ if(QT4_QMAKE_FOUND)
     if (QT_${basename}_INCLUDE_DIR)
 
       # if only the release version was found, set the debug variable also to the release version
-      if (QT_${basename}_LIBRARY AND not QT_${basename}_LIBRARY_DEBUG)
+      if (QT_${basename}_LIBRARY AND NOT QT_${basename}_LIBRARY_DEBUG)
         set(QT_${basename}_LIBRARY_DEBUG ${QT_${basename}_LIBRARY})
-      endif (QT_${basename}_LIBRARY AND not QT_${basename}_LIBRARY_DEBUG)
+      endif (QT_${basename}_LIBRARY AND NOT QT_${basename}_LIBRARY_DEBUG)
 
       # if only the debug version was found, set the release variable also to the debug version
-      if (QT_${basename}_LIBRARY_DEBUG AND not QT_${basename}_LIBRARY)
+      if (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY)
         set(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG})
-      endif (QT_${basename}_LIBRARY_DEBUG AND not QT_${basename}_LIBRARY)
+      endif (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY)
 
       if (QT_${basename}_LIBRARY)
         set(QT_${basename}_FOUND 1)
@@ -511,12 +511,12 @@ if(QT4_QMAKE_FOUND)
   #          ( moc, uic, rcc )
   #
   #######################################
-  if (not QT_BINARY_DIR)
+  if (NOT QT_BINARY_DIR)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
         ARGS "-query QT_INSTALL_BINS"
         OUTPUT_VARIABLE qt_bins )
      set(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
-  endif (not QT_BINARY_DIR)
+  endif (NOT QT_BINARY_DIR)
 
   # at first without the system paths, in order to prefer e.g. ${QTDIR}/bin/qmake over /usr/bin/qmake,
   # which might be a Qt3 qmake
@@ -536,9 +536,9 @@ if(QT4_QMAKE_FOUND)
     )
 
   # if qmake wasn't found in the specific dirs, now check the system path
-  if (not QT_MOC_EXECUTABLE)
+  if (NOT QT_MOC_EXECUTABLE)
      FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc )
-  endif (not QT_MOC_EXECUTABLE)
+  endif (NOT QT_MOC_EXECUTABLE)
 
   if (QT_MOC_EXECUTABLE)
      set ( QT_WRAP_CPP "YES")
@@ -574,9 +574,9 @@ if(QT4_QMAKE_FOUND)
     NO_SYSTEM_PATH
     )
 
-  if (not QT_UIC_EXECUTABLE)
+  if (NOT QT_UIC_EXECUTABLE)
      FIND_PROGRAM(QT_UIC_EXECUTABLE NAMES uic )
-  endif (not QT_UIC_EXECUTABLE)
+  endif (NOT QT_UIC_EXECUTABLE)
 
   if (QT_UIC_EXECUTABLE)
      set ( QT_WRAP_UI "YES")
@@ -697,14 +697,14 @@ 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( 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)
+    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!")
+      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})
@@ -739,7 +739,7 @@ else(QT4_QMAKE_FOUND)
     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!")
+     message( FATAL_ERROR "Qt qmake NOT found!")
   endif( Qt4_FIND_REQUIRED)
 
 endif(QT4_QMAKE_FOUND)
diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake
index 463fcc25..49934fd3 100644
--- a/modules/FindTIFF.cmake
+++ b/modules/FindTIFF.cmake
@@ -3,8 +3,8 @@
 # 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_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

diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake
index f0e61210..19c85804 100644
--- a/modules/FindX11.cmake
+++ b/modules/FindX11.cmake
@@ -75,7 +75,7 @@ if (UNIX)
 
       # 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)
@@ -86,11 +86,11 @@ if (UNIX)
             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)
@@ -100,34 +100,34 @@ if (UNIX)
             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})
         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)
         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)
         endif (CMAKE_LIB_IPS_HAS_SHMAT)
-      endif(not CMAKE_HAVE_SHMAT)
+      endif(NOT CMAKE_HAVE_SHMAT)
     endif($ENV{ISC} MATCHES "^yes$")
 
     CHECK_LIBRARY_EXISTS("ICE" "IceConnectionNumber" "${X11_LIBRARY_DIR}"
diff --git a/modules/KDE3Macros.cmake b/modules/KDE3Macros.cmake
index 7411ed00..c7da385a 100644
--- a/modules/KDE3Macros.cmake
+++ b/modules/KDE3Macros.cmake
@@ -51,7 +51,7 @@ MACRO(KDE3_ADD_DCOP_SKELS _sources)
       set(_skel ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.cpp)
       set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl)
 
-      if (not HAVE_${_basename}_KIDL_RULE)
+      if (NOT HAVE_${_basename}_KIDL_RULE)
          set(HAVE_${_basename}_KIDL_RULE ON)
 
           ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
@@ -59,9 +59,9 @@ MACRO(KDE3_ADD_DCOP_SKELS _sources)
           ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} > ${_kidl}
           DEPENDS ${_tmp_FILE}
          )
-       endif (not HAVE_${_basename}_KIDL_RULE)
+       endif (NOT HAVE_${_basename}_KIDL_RULE)
 
-      if (not HAVE_${_basename}_SKEL_RULE)
+      if (NOT HAVE_${_basename}_SKEL_RULE)
         set(HAVE_${_basename}_SKEL_RULE ON)
 
        ADD_CUSTOM_COMMAND(OUTPUT ${_skel}
@@ -70,7 +70,7 @@ MACRO(KDE3_ADD_DCOP_SKELS _sources)
           DEPENDS ${_kidl}
           )
 
-      endif (not HAVE_${_basename}_SKEL_RULE)
+      endif (NOT HAVE_${_basename}_SKEL_RULE)
 
       set(${_sources} ${${_sources}} ${_skel})
 
@@ -88,7 +88,7 @@ MACRO(KDE3_ADD_DCOP_STUBS _sources)
       set(_stub_CPP ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.cpp)
       set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl)
 
-      if (not HAVE_${_basename}_KIDL_RULE)
+      if (NOT HAVE_${_basename}_KIDL_RULE)
         set(HAVE_${_basename}_KIDL_RULE ON)
 
 
@@ -98,10 +98,10 @@ MACRO(KDE3_ADD_DCOP_STUBS _sources)
            DEPENDS ${tmp_FILE}
            )
 
-      endif (not HAVE_${_basename}_KIDL_RULE)
+      endif (NOT HAVE_${_basename}_KIDL_RULE)
 
 
-      if (not HAVE_${_basename}_STUB_RULE)
+      if (NOT HAVE_${_basename}_STUB_RULE)
         set(HAVE_${_basename}_STUB_RULE ON)
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_stub_CPP}
@@ -110,7 +110,7 @@ MACRO(KDE3_ADD_DCOP_STUBS _sources)
            DEPENDS ${_kidl}
          )
 
-      endif (not HAVE_${_basename}_STUB_RULE)
+      endif (NOT HAVE_${_basename}_STUB_RULE)
 
       set(${_sources} ${${_sources}} ${_stub_CPP})
 
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index fbf58ba1..35d915f3 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -28,7 +28,7 @@ MACRO(KDE4_ADD_DCOP_SKELS _sources)
       set(_skel_H ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.h)
       set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl)
 
-      if (not HAVE_${_basename}_KIDL_RULE)
+      if (NOT HAVE_${_basename}_KIDL_RULE)
         set(HAVE_${_basename}_KIDL_RULE ON)
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
@@ -36,9 +36,9 @@ MACRO(KDE4_ADD_DCOP_SKELS _sources)
            ARGS --srcdir ${KDE4_KALYPTUS_DIR} -o ${_kidl} ${_tmp_FILE}
            DEPENDS ${_tmp_FILE}
         )
-      endif (not HAVE_${_basename}_KIDL_RULE)
+      endif (NOT HAVE_${_basename}_KIDL_RULE)
 
-      if (not HAVE_${_basename}_SKEL_RULE)
+      if (NOT HAVE_${_basename}_SKEL_RULE)
         set(HAVE_${_basename}_SKEL_RULE ON)
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_skel}
@@ -48,7 +48,7 @@ MACRO(KDE4_ADD_DCOP_SKELS _sources)
 
         MACRO_ADDITIONAL_CLEAN_FILES( ${_skel_H})
 
-      endif (not HAVE_${_basename}_SKEL_RULE)
+      endif (NOT HAVE_${_basename}_SKEL_RULE)
 
       set(${_sources} ${${_sources}} ${_skel})
 
@@ -68,7 +68,7 @@ MACRO(KDE4_ADD_DCOP_STUBS _sources)
       set(_stub_H ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.h)
       set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl)
 
-      if (not HAVE_${_basename}_KIDL_RULE)
+      if (NOT HAVE_${_basename}_KIDL_RULE)
         set(HAVE_${_basename}_KIDL_RULE ON)
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
@@ -76,9 +76,9 @@ MACRO(KDE4_ADD_DCOP_STUBS _sources)
            ARGS --srcdir ${KDE4_KALYPTUS_DIR} -o ${_kidl} ${_tmp_FILE}
            DEPENDS ${_tmp_FILE}
         )
-      endif (not HAVE_${_basename}_KIDL_RULE)
+      endif (NOT HAVE_${_basename}_KIDL_RULE)
 
-      if (not HAVE_${_basename}_STUB_RULE)
+      if (NOT HAVE_${_basename}_STUB_RULE)
         set(HAVE_${_basename}_STUB_RULE ON)
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_stub_CPP}
@@ -88,7 +88,7 @@ MACRO(KDE4_ADD_DCOP_STUBS _sources)
 
         MACRO_ADDITIONAL_CLEAN_FILES( ${_stub_H})
 
-      endif (not HAVE_${_basename}_STUB_RULE)
+      endif (NOT HAVE_${_basename}_STUB_RULE)
 
       set(${_sources} ${${_sources}} ${_stub_CPP})
 
@@ -238,6 +238,7 @@ MACRO(KDE4_AUTOMOC)
 
          STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}")
          if(_match)
+message("For ${_tmp_FILE} (${_current_FILE}) : found moc include")
             foreach (_current_MOC_INC ${_match})
                STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
 
@@ -272,7 +273,7 @@ MACRO(KDE4_INSTALL_ICONS _theme _defaultpath )
       STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
       STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name  "${_current_ICON}")
       # if the string doesn't match the pattern, the result is the full string, so all three have the same content
- 	   if( not ${_size} STREQUAL ${_name} )
+ 	   if( NOT ${_size} STREQUAL ${_name} )
 	 	   set(_icon_GROUP "actions")
 
       	if(${_group} STREQUAL "mime")
@@ -299,7 +300,7 @@ MACRO(KDE4_INSTALL_ICONS _theme _defaultpath )
       	set(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
       	FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
       	FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
-	   endif( not ${_size} STREQUAL ${_name} )
+	   endif( NOT ${_size} STREQUAL ${_name} )
    endforeach (_current_ICON)
    FILE(GLOB _icons *.svgz)
    foreach(_current_ICON ${_icons} )
@@ -416,7 +417,7 @@ MACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)
    endif(_first_SRC)
 
 #   if (UNIX)
-   # I guess under windows the libtool file are not required
+   # I guess under windows the libtool file are NOT required
    #KDE4_INSTALL_LIBTOOL_FILE(${_target_NAME})
 #   endif (UNIX)
 
diff --git a/modules/README b/modules/README
index e13ffafd..14fab742 100644
--- a/modules/README
+++ b/modules/README
@@ -1,6 +1,6 @@
 these are additional cmake modules required for compiling KDE3 or KDE4
 applications with cmake. Some of them are enhanced versions of the files 
-coming with cmake, some of them are not yet part of cmake.
+coming with cmake, some of them are NOT yet part of cmake.
 To use them, copy them into the cmake Module directory or
 run "cmake ."  followed by "make install"
 
diff --git a/modules/UsePkgConfig.cmake b/modules/UsePkgConfig.cmake
index 2deba4d7..aafe7942 100644
--- a/modules/UsePkgConfig.cmake
+++ b/modules/UsePkgConfig.cmake
@@ -3,7 +3,7 @@
 #   PKGCONFIG(package includedir libdir linkflags cflags)
 #     - Calling PKGCONFIG will fill the desired information into the 4 given arguments,
 #       e.g. PKGCONFIG(libart-2.0 LIBART_INCLUDE_DIR LIBART_LINK_DIR LIBART_LINK_FLAGS LIBART_CFLAGS)
-#      if pkg-config was not found or the specified software package doesn't exist, the
+#      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 )
@@ -21,7 +21,7 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
     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} )
 
@@ -31,7 +31,7 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
 
       EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
 
-    endif(not _return_VALUE)
+    endif(NOT _return_VALUE)
 
   endif(PKGCONFIG_EXECUTABLE)