cmake: get rid of the old & ugly syntax of having arguments in else(), endif(), endmacro(), endfunction()

This is an old cmake syntax that is not required anymore.
It's ugly and makes code hard to read.

23 files changed, 228 insertions, 227 deletions

diff --git a/cmake/modules/BasicFindPackageVersion.cmake.in b/cmake/modules/BasicFindPackageVersion.cmake.in
index 2be6d9ec..284bee98 100644
--- a/cmake/modules/BasicFindPackageVersion.cmake.in
+++ b/cmake/modules/BasicFindPackageVersion.cmake.in
@@ -21,10 +21,10 @@ set(PACKAGE_VERSION @PROJECT_VERSION_FULL@)
 
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+else()
    set(PACKAGE_VERSION_COMPATIBLE TRUE)
    if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
       set(PACKAGE_VERSION_EXACT TRUE)
-   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   endif()
+endif()
 
diff --git a/cmake/modules/CompilerWarnings.cmake b/cmake/modules/CompilerWarnings.cmake
index e62ba7c1..a89a3a73 100644
--- a/cmake/modules/CompilerWarnings.cmake
+++ b/cmake/modules/CompilerWarnings.cmake
@@ -5,13 +5,13 @@ macro(check_lang_compiler_flag lang flag variable)
 
     if(${lang} STREQUAL c)
         check_c_compiler_flag(${flag} ${variable})
-    endif(${lang} STREQUAL c)
+    endif()
 
     if(${lang} STREQUAL cxx)
         check_cxx_compiler_flag(${flag} ${variable})
-    endif(${lang} STREQUAL cxx)
+    endif()
 
-endmacro(check_lang_compiler_flag flag variable)
+endmacro()
 
 macro(compiler_warnings ret lang werror_by_default desirable_flags undesirable_flags)
     set(warning_flags "")
@@ -19,14 +19,14 @@ macro(compiler_warnings ret lang werror_by_default desirable_flags undesirable_f
         check_lang_compiler_flag(${lang} -W${flag} ${flag}_${lang}_result)
         if(${${flag}_${lang}_result})
             set(warning_flags "${warning_flags} -W${flag}")
-        endif( ${${flag}_${lang}_result} )
-    endforeach(flag ${desirable_flags})
+        endif()
+    endforeach()
 
     check_lang_compiler_flag(${lang} -Werror error_${lang}_result)
 
     if(${error_${lang}_result})
         set(error_flags "-Werror")
-    endif(${error_${lang}_result})
+    endif()
 
     set(all_nowarning_flags_supported 1)
 
@@ -35,29 +35,29 @@ macro(compiler_warnings ret lang werror_by_default desirable_flags undesirable_f
 
         if(${${flag}_${lang}_result})
             set(warning_flags "${warning_flags} -Wno-${flag}")
-        else(${${flag}_${lang}_result})
+        else()
             set(all_nowarning_flags_supported 0)
             break()
-        endif(${${flag}_${lang}_result})
+        endif()
 
         check_lang_compiler_flag(${lang} -Wno-error=${flag} noerror_${flag}_${lang}_result)
 
         if(${noerror_${flag}_${lang}_result})
             set(error_flags "${error_flags} -Wno-error=${flag}")
-        endif(${noerror_${flag}_${lang}_result})
+        endif()
 
-    endforeach(flag ${undesirable_flags})
+    endforeach()
 
     if(DISABLE_WERROR)
         set(enable_werror 0)
-    else(DISABLE_WERROR)
+    else()
         set(enable_werror 1)
-    endif(DISABLE_WERROR)
+    endif()
 
     if(${werror_by_default} AND ${enable_werror} AND ${all_nowarning_flags_supported})
         set(${ret} "${warning_flags} ${error_flags}")
-    else(${werror_by_default} AND ${enable_werror} AND ${all_nowarning_flags_supported})
+    else()
         set(${ret} "${warning_flags}")
-    endif(${werror_by_default} AND ${enable_werror} AND ${all_nowarning_flags_supported})
+    endif()
 
-endmacro(compiler_warnings ret lang werror_by_default desirable_flags undesirable_flags)
+endmacro()
diff --git a/cmake/modules/Doxygen.cmake b/cmake/modules/Doxygen.cmake
index 804c217f..11962f13 100644
--- a/cmake/modules/Doxygen.cmake
+++ b/cmake/modules/Doxygen.cmake
@@ -15,12 +15,12 @@ if(DOXYGEN_FOUND)
 
         if (NOT PERL_FOUND)
             message(WARNING "Perl was not found. Qt crosslinks in uploaded docs won't be valid.")
-        endif (NOT PERL_FOUND)
-    else(EXISTS ${QT_TAGS_FILE})
+        endif ()
+    else()
         message(WARNING "html/qt.tags not found in ${QT_DOC_DIR}. Set the QT_DOC_DIR variable to
 point to its location to enable crosslinking.")
         unset(QT_TAGS_FILE)
-    endif(EXISTS ${QT_TAGS_FILE})
+    endif()
 
     set(abs_top_builddir ${CMAKE_BINARY_DIR})
     set(abs_top_srcdir   ${CMAKE_SOURCE_DIR})
@@ -34,4 +34,4 @@ point to its location to enable crosslinking.")
     set(GENERATE_QHP     ${QHELPGENERATOR_FOUND})
     configure_file(doxygen.cfg.in ${CMAKE_BINARY_DIR}/doxygen.cfg)
     add_custom_target(doxygen-doc ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doxygen.cfg)
-endif(DOXYGEN_FOUND)
+endif()
diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake
index 872b7bbb..f8379e78 100644
--- a/cmake/modules/FindDBus.cmake
+++ b/cmake/modules/FindDBus.cmake
@@ -18,7 +18,7 @@
 if (NOT WIN32)
     find_package(PkgConfig)
     pkg_check_modules(PC_DBUS dbus-1)
-endif (NOT WIN32)
+endif ()
 
 find_path(DBUS_INCLUDE_DIR dbus/dbus.h
     PATHS ${PC_DBUS_INCLUDE_DIRS}
diff --git a/cmake/modules/FindDBusGLib.cmake b/cmake/modules/FindDBusGLib.cmake
index e0abf1b4..44e7c380 100644
--- a/cmake/modules/FindDBusGLib.cmake
+++ b/cmake/modules/FindDBusGLib.cmake
@@ -13,20 +13,20 @@ set(DBUS_GLIB_FIND_REQUIRED ${DBusGLib_FIND_REQUIRED})
 if(DBUS_GLIB_INCLUDE_DIR AND DBUS_GLIB_LIBRARIES)
   # Already in cache, be silent
   set(DBUS_GLIB_FIND_QUIETLY TRUE)
-endif(DBUS_GLIB_INCLUDE_DIR AND DBUS_GLIB_LIBRARIES)
+endif()
 
 if(NOT WIN32)
     find_package(PkgConfig)
     if (DBusGLib_FIND_VERSION_EXACT)
         pkg_check_modules(PC_DBUS_GLIB QUIET dbus-glib-1=${DBusGLib_FIND_VERSION})
-    else (DBusGLib_FIND_VERSION_EXACT)
+    else ()
         if (DBusGLib_FIND_VERSION)
             pkg_check_modules(PC_DBUS_GLIB REQUIRED dbus-glib-1>=${DBusGLib_FIND_VERSION})
-        else (DBusGLib_FIND_VERSION)
+        else ()
             pkg_check_modules(PC_DBUS_GLIB REQUIRED dbus-glib-1)
-        endif (DBusGLib_FIND_VERSION)
-    endif (DBusGLib_FIND_VERSION_EXACT)
-endif(NOT WIN32)
+        endif ()
+    endif ()
+endif()
 
 find_path(DBUS_GLIB_INCLUDE_DIR
           NAMES dbus-1.0/dbus/dbus-glib.h
diff --git a/cmake/modules/FindFarstream.cmake b/cmake/modules/FindFarstream.cmake
index 33139c38..58b5c2cd 100644
--- a/cmake/modules/FindFarstream.cmake
+++ b/cmake/modules/FindFarstream.cmake
@@ -14,9 +14,9 @@
 if (FARSTREAM_INCLUDE_DIR AND FARSTREAM_LIBRARIES)
    # in cache already
    set(Farstream_FIND_QUIETLY TRUE)
-else (FARSTREAM_INCLUDE_DIR AND FARSTREAM_LIBRARIES)
+else ()
    set(Farstream_FIND_QUIETLY FALSE)
-endif (FARSTREAM_INCLUDE_DIR AND FARSTREAM_LIBRARIES)
+endif ()
 
 if (NOT WIN32)
     # use pkg-config to get the directories and then use these values
@@ -24,11 +24,11 @@ if (NOT WIN32)
     find_package(PkgConfig)
     if (FARSTREAM_MIN_VERSION)
         PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
-    else (FARSTREAM_MIN_VERSION)
+    else ()
         PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
-    endif (FARSTREAM_MIN_VERSION)
+    endif ()
     set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
-endif (NOT WIN32)
+endif ()
 
 find_path(FARSTREAM_INCLUDE_DIR farstream/fs-conference.h
    PATHS
diff --git a/cmake/modules/FindGIO.cmake b/cmake/modules/FindGIO.cmake
index 3f5e6d32..e290f0a4 100644
--- a/cmake/modules/FindGIO.cmake
+++ b/cmake/modules/FindGIO.cmake
@@ -14,7 +14,7 @@
 if(GIO_INCLUDE_DIR AND GIO_LIBRARIES)
     # Already in cache, be silent
     set(GIO_FIND_QUIETLY TRUE)
-endif(GIO_INCLUDE_DIR AND GIO_LIBRARIES)
+endif()
 
 include(UsePkgConfig)
 pkg_check_modules(PC_LibGIO gio-2.0)
diff --git a/cmake/modules/FindGIOUnix.cmake b/cmake/modules/FindGIOUnix.cmake
index 228a86ad..263c093e 100644
--- a/cmake/modules/FindGIOUnix.cmake
+++ b/cmake/modules/FindGIOUnix.cmake
@@ -13,7 +13,7 @@
 if(GIOUNIX_INCLUDE_DIR)
     # Already in cache, be silent
     set(GIOUNIX_FIND_QUIETLY TRUE)
-endif(GIOUNIX_INCLUDE_DIR)
+endif()
 
 include(UsePkgConfig)
 pkg_check_modules(PC_LibGIOUnix gio-unix-2.0)
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
index e40f05f9..4605a23a 100644
--- a/cmake/modules/FindGLIB2.cmake
+++ b/cmake/modules/FindGLIB2.cmake
@@ -14,7 +14,7 @@
 if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
     # Already in cache, be silent
     set(GLIB2_FIND_QUIETLY TRUE)
-endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+endif()
 
 find_package(PkgConfig)
 pkg_check_modules(PC_LibGLIB2 glib-2.0)
@@ -44,7 +44,7 @@ set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}")
 # for now it is optional
 if(GLIB2_INTERNAL_INCLUDE_DIR)
   set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}")
-endif(GLIB2_INTERNAL_INCLUDE_DIR)
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GLIB2  DEFAULT_MSG  GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR)
diff --git a/cmake/modules/FindGObject.cmake b/cmake/modules/FindGObject.cmake
index 1507b430..72db6e5d 100644
--- a/cmake/modules/FindGObject.cmake
+++ b/cmake/modules/FindGObject.cmake
@@ -13,9 +13,9 @@
 IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
    # in cache already
    SET(GObject_FIND_QUIETLY TRUE)
-ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ELSE ()
    SET(GObject_FIND_QUIETLY FALSE)
-ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ENDIF ()
 
 IF (NOT WIN32)
    FIND_PACKAGE(PkgConfig REQUIRED)
@@ -23,7 +23,7 @@ IF (NOT WIN32)
    # in the FIND_PATH() and FIND_LIBRARY() calls
    PKG_CHECK_MODULES(PKG_GOBJECT2 REQUIRED gobject-2.0)
    SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS})
-ENDIF (NOT WIN32)
+ENDIF ()
 
 FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h
    PATHS
@@ -51,25 +51,25 @@ FIND_LIBRARY(_GLibs NAMES glib-2.0
 
 IF (WIN32)
 SET (GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs})
-ELSE (WIN32)
+ELSE ()
 SET (GOBJECT_LIBRARIES ${PKG_GOBJECT2_LIBRARIES})
-ENDIF (WIN32)
+ENDIF ()
 
 IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
    SET(GOBJECT_FOUND TRUE)
-ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ELSE ()
    SET(GOBJECT_FOUND FALSE)
-ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ENDIF ()
 
 IF (GOBJECT_FOUND)
    IF (NOT GObject_FIND_QUIETLY)
       MESSAGE(STATUS "Found GObject libraries: ${GOBJECT_LIBRARIES}")
       MESSAGE(STATUS "Found GObject includes : ${GOBJECT_INCLUDE_DIR}")
-   ENDIF (NOT GObject_FIND_QUIETLY)
-ELSE (GOBJECT_FOUND)
+   ENDIF ()
+ELSE ()
     IF (GObject_FIND_REQUIRED)
       MESSAGE(STATUS "Could NOT find GObject")
-    ENDIF(GObject_FIND_REQUIRED)
-ENDIF (GOBJECT_FOUND)
+    ENDIF()
+ENDIF ()
 
 MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR GOBJECT_LIBRARIES)
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
index ffdd7a9e..891e9c31 100644
--- a/cmake/modules/FindGStreamer.cmake
+++ b/cmake/modules/FindGStreamer.cmake
@@ -16,9 +16,9 @@
 IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
    # in cache already
    SET(GSTREAMER_FIND_QUIETLY TRUE)
-ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+ELSE ()
    SET(GSTREAMER_FIND_QUIETLY FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+ENDIF ()
 
 IF (NOT WIN32)
    # use pkg-config to get the directories and then use these values
@@ -29,7 +29,7 @@ IF (NOT WIN32)
    #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}")
    #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}")
    SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER})
-ENDIF (NOT WIN32)
+ENDIF ()
 
 FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
    PATHS
@@ -62,21 +62,21 @@ FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0
 
 IF (GSTREAMER_INCLUDE_DIR)
    #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}")
-ELSE (GSTREAMER_INCLUDE_DIR)
+ELSE ()
    MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
-ENDIF (GSTREAMER_INCLUDE_DIR)
+ENDIF ()
 
 IF (GSTREAMER_CONF_INCLUDE_DIR)
 	#MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}")
-ELSE (GSTREAMER_CONF_INCLUDE_DIR)
+ELSE ()
    MESSAGE(STATUS "GStreamer: WARNING: config include dir not found")
-ENDIF (GSTREAMER_CONF_INCLUDE_DIR)
+ENDIF ()
 
 IF (GSTREAMER_LIBRARIES)
    #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")
-ELSE (GSTREAMER_LIBRARIES)
+ELSE ()
    MESSAGE(STATUS "GStreamer: WARNING: library not found")
-ENDIF (GSTREAMER_LIBRARIES)
+ENDIF ()
 
 
 INCLUDE(FindPackageHandleStandardArgs)
diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake
index 353be558..5d0ce6f6 100644
--- a/cmake/modules/FindLibXml2.cmake
+++ b/cmake/modules/FindLibXml2.cmake
@@ -16,7 +16,7 @@
 IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
    # in cache already
    SET(LibXml2_FIND_QUIETLY TRUE)
-ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+ENDIF ()
 
 IF (NOT WIN32)
    # use pkg-config to get the directories and then use these values
@@ -24,7 +24,7 @@ IF (NOT WIN32)
    FIND_PACKAGE(PkgConfig)
    PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
    SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
-ENDIF (NOT WIN32)
+ENDIF ()
 
 FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
    HINTS
@@ -45,7 +45,7 @@ SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}")
 
 IF( NOT LIBXML2_XMLLINT_EXECUTABLE )
    MESSAGE(STATUS "xmllint program not found. Install it if you want validate generated doc file.")
-ENDIF(NOT LIBXML2_XMLLINT_EXECUTABLE )
+ENDIF()
 
 
 INCLUDE(FindPackageHandleStandardArgs)
diff --git a/cmake/modules/FindPythonLibrary.cmake b/cmake/modules/FindPythonLibrary.cmake
index c6bb7127..2c052bad 100644
--- a/cmake/modules/FindPythonLibrary.cmake
+++ b/cmake/modules/FindPythonLibrary.cmake
@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
 if(EXISTS PYTHON_LIBRARY)
   # Already in cache, be silent
   set(PYTHONLIBRARY_FOUND TRUE)
-else(EXISTS PYTHON_LIBRARY)
+else()
   message(STATUS "PythonLibrary find version: ${PythonLibrary_FIND_VERSION}")
   FIND_PACKAGE(PythonInterp ${PythonLibrary_FIND_VERSION})
 
@@ -45,10 +45,10 @@ else(EXISTS PYTHON_LIBRARY)
       set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT})
       if(WIN32)
           STRING(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR})
-      endif(WIN32)
+      endif()
       FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES} PATHS ${PYTHON_PREFIX}/lib ${PYTHON_PREFIX}/libs NO_DEFAULT_PATH)
       set(PYTHONLIBRARY_FOUND TRUE)
-    endif(python_config)
+    endif()
 
     # adapted from cmake's builtin FindPythonLibs
     if(APPLE)
@@ -60,25 +60,26 @@ else(EXISTS PYTHON_LIBRARY)
         if("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework")
           set(PYTHON_LIBRARY "")
           set(PYTHON_DEBUG_LIBRARY "")
-        endif("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework")
+        endif()
         if(NOT PYTHON_LIBRARY)
           set (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-        endif(NOT PYTHON_LIBRARY)
+        endif()
         set(PYTHONLIBRARY_FOUND TRUE)
-      endif(Python_FRAMEWORKS)
-    endif(APPLE)
-  endif(PYTHONINTERP_FOUND)
+      endif()
+    endif()
+
+  endif()
 
   if(PYTHONLIBRARY_FOUND)
     set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
     if(NOT PYTHONLIBRARY_FIND_QUIETLY)
       message(STATUS "Found Python executable: ${PYTHON_EXECUTABLE}")
       message(STATUS "Found Python version: ${PYTHON_LONG_VERSION}")
-    endif(NOT PYTHONLIBRARY_FIND_QUIETLY)
-  else(PYTHONLIBRARY_FOUND)
+    endif()
+  else()
     if(PYTHONLIBRARY_FIND_REQUIRED)
       message(FATAL_ERROR "Could not find Python")
-    endif(PYTHONLIBRARY_FIND_REQUIRED)
-  endif(PYTHONLIBRARY_FOUND)
+    endif()
+  endif()
 
-endif (EXISTS PYTHON_LIBRARY)
+endif()
diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
index 5cb2836b..574aef29 100644
--- a/cmake/modules/FindQt.cmake
+++ b/cmake/modules/FindQt.cmake
@@ -12,8 +12,8 @@ IF(DESIRED_QT_VERSION MATCHES 5)
     find_package(Qt5Core QUIET)
     IF( Qt5Core_DIR )
         SET(QT5_INSTALLED TRUE)
-    ENDIF( Qt5Core_DIR )
-ENDIF(DESIRED_QT_VERSION MATCHES 5)
+    ENDIF()
+ENDIF()
 
 #Otherwise search for installed qmakes
 IF(NOT QT5_INSTALLED)
@@ -21,28 +21,28 @@ IF(NOT QT5_INSTALLED)
         FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5
             PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
         SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.")
-    ENDIF(NOT QT_QMAKE_EXECUTABLE)
+    ENDIF()
 
     # now find qmake
     IF(QT_QMAKE_EXECUTABLE)
         EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
         IF(QTVERSION MATCHES "4.*")
             SET(QT4_INSTALLED TRUE)
-        ENDIF(QTVERSION MATCHES "4.*")
+        ENDIF()
         IF(QTVERSION MATCHES "5.*")
             SET(QT5_INSTALLED TRUE)
-        ENDIF(QTVERSION MATCHES "5.*")
-    ENDIF(QT_QMAKE_EXECUTABLE)
-ENDIF(NOT QT5_INSTALLED)
+        ENDIF()
+    ENDIF()
+ENDIF()
 
 IF(NOT DESIRED_QT_VERSION)
   IF(QT4_INSTALLED)
     SET(DESIRED_QT_VERSION 4 CACHE STRING "Pick a version of Qt to use: 4 or 5")
-  ENDIF(QT4_INSTALLED)
+  ENDIF()
   IF(QT5_INSTALLED)
     SET(DESIRED_QT_VERSION 5 CACHE STRING "Pick a version of Qt to use: 4 or 5")
-  ENDIF(QT5_INSTALLED)
-ENDIF(NOT DESIRED_QT_VERSION)
+  ENDIF()
+ENDIF()
 
 IF(DESIRED_QT_VERSION MATCHES 4)
   SET(Qt4_FIND_REQUIRED ${Qt_FIND_REQUIRED})
@@ -50,55 +50,55 @@ IF(DESIRED_QT_VERSION MATCHES 4)
   SET(QT_MIN_VERSION    ${QT4_MIN_VERSION})
   SET(QT_MAX_VERSION    ${QT4_MAX_VERSION})
   INCLUDE(FindQt4)
-ENDIF(DESIRED_QT_VERSION MATCHES 4)
+ENDIF()
 IF(DESIRED_QT_VERSION MATCHES 5)
   SET(Qt5_FIND_REQUIRED ${Qt_FIND_REQUIRED})
   SET(Qt5_FIND_QUIETLY  ${Qt_FIND_QUIETLY})
   SET(QT_MIN_VERSION    ${QT5_MIN_VERSION})
   SET(QT_MAX_VERSION    ${QT5_MAX_VERSION})
   INCLUDE(FindQt5)
-ENDIF(DESIRED_QT_VERSION MATCHES 5)
+ENDIF()
 
 IF(NOT QT4_INSTALLED AND NOT QT5_INSTALLED)
   IF(Qt_FIND_REQUIRED)
     MESSAGE(SEND_ERROR "CMake was unable to find any Qt versions, put qmake in your path, or set QTDIR/QT_QMAKE_EXECUTABLE.")
-  ENDIF(Qt_FIND_REQUIRED)
-ELSE(NOT QT4_INSTALLED AND NOT QT5_INSTALLED)
+  ENDIF()
+ELSE()
   IF(NOT QT_FOUND)
     IF(Qt_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "CMake was unable to find Qt version: ${DESIRED_QT_VERSION}, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.")
-    ELSE(Qt_FIND_REQUIRED)
+    ELSE()
       MESSAGE("CMake was unable to find Qt version: ${DESIRED_QT_VERSION}, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.")
-    ENDIF(Qt_FIND_REQUIRED)
-  ENDIF(NOT QT_FOUND)
-ENDIF(NOT QT4_INSTALLED AND NOT QT5_INSTALLED)
+    ENDIF()
+  ENDIF()
+ENDIF()
 
 MACRO(QT_GET_MOC_FLAGS moc_flags)
   IF(QT_VERSION_MAJOR MATCHES 4)
     QT4_GET_MOC_FLAGS(${moc_flags})
-  ELSE(QT_VERSION_MAJOR MATCHES 4)
+  ELSE()
     IF(QT_VERSION_MAJOR MATCHES 5)
       QT5_GET_MOC_FLAGS(${moc_flags})
-    ENDIF(QT_VERSION_MAJOR MATCHES 5)
-  ENDIF(QT_VERSION_MAJOR MATCHES 4)
-ENDMACRO(QT_GET_MOC_FLAGS)
+    ENDIF()
+  ENDIF()
+ENDMACRO()
 
 MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
   IF(QT_VERSION_MAJOR MATCHES 4)
     IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
       QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+    ELSE()
       QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-  ELSE(QT_VERSION_MAJOR MATCHES 4)
+    ENDIF()
+  ELSE()
     IF(QT_VERSION_MAJOR MATCHES 5)
       IF(QTVERSION VERSION_GREATER 5.1.99)
         QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
       ELSE()
         QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
       ENDIF()
-    ENDIF(QT_VERSION_MAJOR MATCHES 5)
-  ENDIF(QT_VERSION_MAJOR MATCHES 4)
-ENDMACRO(QT_CREATE_MOC_COMMAND)
+    ENDIF()
+  ENDIF()
+ENDMACRO()
 
 MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE_FINDQT)
diff --git a/cmake/modules/FindQt5.cmake b/cmake/modules/FindQt5.cmake
index b9a35e16..ffd5dd38 100644
--- a/cmake/modules/FindQt5.cmake
+++ b/cmake/modules/FindQt5.cmake
@@ -42,14 +42,14 @@ IF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5)
   SET(QT_FOUND TRUE)
   SET(QT5_FOUND TRUE)
   RETURN()
-ENDIF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5)
+ENDIF()
 
-IF(NOT Qt5Core_DIR )
+IF(NOT Qt5Core_DIR)
     IF(NOT QT_QMAKE_EXECUTABLE)
         FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake5 qmake-qt5
             PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
         SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.")
-    ENDIF(NOT QT_QMAKE_EXECUTABLE)
+    ENDIF()
 
     EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
     IF(NOT QTVERSION MATCHES "5.*")
@@ -57,10 +57,10 @@ IF(NOT Qt5Core_DIR )
         SET(QT5_FOUND FALSE)
         IF(Qt5_FIND_REQUIRED)
             MESSAGE(FATAL_ERROR "CMake was unable to find Qt5, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.")
-        ENDIF(Qt5_FIND_REQUIRED)
+        ENDIF()
         RETURN()
-    ENDIF(NOT QTVERSION MATCHES "5.*")
-ENDIF(NOT Qt5Core_DIR )
+    ENDIF()
+ENDIF()
 
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED)
@@ -93,27 +93,27 @@ GET_PROPERTY(QT_QMAKE_EXECUTABLE TARGET ${Qt5Core_QMAKE_EXECUTABLE} PROPERTY IMP
 IF(NOT QT_INCLUDE_DIR)
   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QTHEADERS)
   SET(QT_INCLUDE_DIR ${QTHEADERS} CACHE INTERNAL "" FORCE)
-ENDIF(NOT QT_INCLUDE_DIR)
+ENDIF()
 
 IF(NOT QT_LIBRARY_DIR)
   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QTLIBS)
   SET(QT_LIBRARY_DIR ${QTLIBS} CACHE INTERNAL "" FORCE)
-ENDIF(NOT QT_LIBRARY_DIR)
+ENDIF()
 
 IF(NOT QT_BINARY_DIR)
   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QTBINS)
   SET(QT_BINARY_DIR ${QTBINS} CACHE INTERNAL "" FORCE)
-ENDIF(NOT QT_BINARY_DIR)
+ENDIF()
 
 IF(NOT QT_DOC_DIR)
   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DOCS" OUTPUT_VARIABLE QTDOCS)
   SET(QT_DOC_DIR ${QTDOCS} CACHE INTERNAL "" FORCE)
-ENDIF(NOT QT_DOC_DIR)
+ENDIF()
 
 IF(NOT QT_MOC_EXECUTABLE)
   FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc moc5 moc-qt5 PATHS ${QT_BINARY_DIR}
                NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-ENDIF(NOT QT_MOC_EXECUTABLE)
+ENDIF()
 
 MARK_AS_ADVANCED(QT_INCLUDES QT_INCLUDE_DIR
                  QT_LIBRARIES QT_LIBRARY_DIR
diff --git a/cmake/modules/FindTelepathyFarstream.cmake b/cmake/modules/FindTelepathyFarstream.cmake
index 74b12d88..ad6da206 100644
--- a/cmake/modules/FindTelepathyFarstream.cmake
+++ b/cmake/modules/FindTelepathyFarstream.cmake
@@ -14,9 +14,9 @@
 if (TELEPATHY_FARSTREAM_INCLUDE_DIR AND TELEPATHY_FARSTREAM_LIBRARIES)
    # in cache already
    set(TelepathyFarstream_FIND_QUIETLY TRUE)
-else (TELEPATHY_FARSTREAM_INCLUDE_DIR AND TELEPATHY_FARSTREAM_LIBRARIES)
+else ()
    set(TelepathyFarstream_FIND_QUIETLY FALSE)
-endif (TELEPATHY_FARSTREAM_INCLUDE_DIR AND TELEPATHY_FARSTREAM_LIBRARIES)
+endif ()
 
 if (NOT WIN32)
     # use pkg-config to get the directories and then use these values
@@ -24,11 +24,11 @@ if (NOT WIN32)
     find_package(PkgConfig)
     if (TELEPATHY_FARSTREAM_MIN_VERSION)
         PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream>=${TELEPATHY_FARSTREAM_MIN_VERSION})
-    else (TELEPATHY_FARSTREAM_MIN_VERSION)
+    else ()
         PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream)
-    endif (TELEPATHY_FARSTREAM_MIN_VERSION)
+    endif ()
     set(TELEPATHY_FARSTREAM_DEFINITIONS ${PC_TELEPATHY_FARSTREAM_CFLAGS_OTHER})
-endif (NOT WIN32)
+endif ()
 
 find_path(TELEPATHY_FARSTREAM_INCLUDE_DIR telepathy-farstream/telepathy-farstream.h
    PATHS
diff --git a/cmake/modules/FindTelepathyGlib.cmake b/cmake/modules/FindTelepathyGlib.cmake
index c12b9edb..0e098be6 100644
--- a/cmake/modules/FindTelepathyGlib.cmake
+++ b/cmake/modules/FindTelepathyGlib.cmake
@@ -13,9 +13,9 @@
 if (TELEPATHY_GLIB_INCLUDE_DIR AND TELEPATHY_GLIB_LIBRARIES)
    # in cache already
    set(TELEPATHYGLIB_FIND_QUIETLY TRUE)
-else (TELEPATHY_GLIB_INCLUDE_DIR AND TELEPATHY_GLIB_LIBRARIES)
+else ()
    set(TELEPATHYGLIB_FIND_QUIETLY FALSE)
-endif (TELEPATHY_GLIB_INCLUDE_DIR AND TELEPATHY_GLIB_LIBRARIES)
+endif ()
 
 if (NOT WIN32)
     # use pkg-config to get the directories and then use these values
@@ -23,15 +23,15 @@ if (NOT WIN32)
     find_package(PkgConfig)
     if (TELEPATHY_GLIB_MIN_VERSION)
         PKG_CHECK_MODULES(PC_TELEPATHY_GLIB telepathy-glib>=${TELEPATHY_GLIB_MIN_VERSION})
-    else (TELEPATHY_GLIB_MIN_VERSION)
+    else ()
         PKG_CHECK_MODULES(PC_TELEPATHY_GLIB telepathy-glib)
-    endif (TELEPATHY_GLIB_MIN_VERSION)
+    endif ()
     set(TELEPATHY_GLIB_DEFINITIONS ${PC_TELEPATHY_GLIB_CFLAGS_OTHER})
-endif (NOT WIN32)
+endif ()
 
 if (TELEPATHY_GLIB_MIN_VERSION AND NOT PC_TELEPATHY_GLIB_FOUND)
     message(STATUS "Telepathy-glib not found or its version is < ${TELEPATHY_GLIB_MIN_VERSION}")
-else (TELEPATHY_GLIB_MIN_VERSION AND NOT PC_TELEPATHY_GLIB_FOUND)
+else ()
     find_path(TELEPATHY_GLIB_INCLUDE_DIR telepathy-glib/client.h
        PATHS
        ${PC_TELEPATHY_GLIB_INCLUDEDIR}
@@ -51,4 +51,4 @@ else (TELEPATHY_GLIB_MIN_VERSION AND NOT PC_TELEPATHY_GLIB_FOUND)
 
     mark_as_advanced(TELEPATHY_GLIB_INCLUDE_DIR TELEPATHY_GLIB_LIBRARIES)
 
-endif (TELEPATHY_GLIB_MIN_VERSION AND NOT PC_TELEPATHY_GLIB_FOUND)
+endif ()
diff --git a/cmake/modules/MacroLogFeature.cmake b/cmake/modules/MacroLogFeature.cmake
index 86e1c3cb..ed248be9 100644
--- a/cmake/modules/MacroLogFeature.cmake
+++ b/cmake/modules/MacroLogFeature.cmake
@@ -35,20 +35,20 @@ IF (NOT _macroLogFeatureAlreadyIncluded)
    SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
    IF (EXISTS ${_file})
       FILE(REMOVE ${_file})
-   ENDIF (EXISTS ${_file})
+   ENDIF ()
 
    SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
    IF (EXISTS ${_file})
       FILE(REMOVE ${_file})
-   ENDIF (EXISTS ${_file})
+   ENDIF ()
 
    SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
    IF (EXISTS ${_file})
       FILE(REMOVE ${_file})
-  ENDIF (EXISTS ${_file})
+  ENDIF ()
 
   SET(_macroLogFeatureAlreadyIncluded TRUE)
-ENDIF (NOT _macroLogFeatureAlreadyIncluded)
+ENDIF ()
 
 
 MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments)
@@ -59,37 +59,37 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _
 
    IF (${_var})
      SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
-   ELSE (${_var})
+   ELSE ()
      IF ("${_required}" STREQUAL "TRUE")
        SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
-     ELSE ("${_required}" STREQUAL "TRUE")
+     ELSE ()
        SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-     ENDIF ("${_required}" STREQUAL "TRUE")
-   ENDIF (${_var})
+     ENDIF ()
+   ENDIF ()
 
    SET(_logtext "   * ${_package}")
 
    IF (NOT ${_var})
       IF (${_minvers} MATCHES ".*")
         SET(_logtext "${_logtext} (${_minvers} or higher)")
-      ENDIF (${_minvers} MATCHES ".*")
+      ENDIF ()
       SET(_logtext "${_logtext}  <${_url}>\n     ")
-   ELSE (NOT ${_var})
+   ELSE ()
      SET(_logtext "${_logtext} - ")
-   ENDIF (NOT ${_var})
+   ENDIF ()
 
    SET(_logtext "${_logtext}${_description}")
 
    IF (NOT ${_var})
       IF (${_comments} MATCHES ".*")
         SET(_logtext "${_logtext}\n     ${_comments}")
-      ENDIF (${_comments} MATCHES ".*")
+      ENDIF ()
 #      SET(_logtext "${_logtext}\n") #double-space missing features?
-   ENDIF (NOT ${_var})
+   ENDIF ()
 
    FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")
 
-ENDMACRO(MACRO_LOG_FEATURE)
+ENDMACRO()
 
 
 MACRO(MACRO_DISPLAY_FEATURE_LOG)
@@ -100,7 +100,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
 
    IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
      SET(_printSummary TRUE)
-   ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
+   ENDIF ()
 
    IF(_printSummary)
      SET(_missingDeps 0)
@@ -108,7 +108,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
        FILE(READ ${_enabledFile} _enabled)
        FILE(REMOVE ${_enabledFile})
        SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}")
-     ENDIF (EXISTS ${_enabledFile})
+     ENDIF ()
 
 
      IF (EXISTS ${_disabledFile})
@@ -116,7 +116,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
        FILE(READ ${_disabledFile} _disabled)
        FILE(REMOVE ${_disabledFile})
        SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}")
-     ENDIF (EXISTS ${_disabledFile})
+     ENDIF ()
 
 
      IF (EXISTS ${_missingFile})
@@ -125,12 +125,12 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
        SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}")
        FILE(REMOVE ${_missingFile})
        SET(_haveMissingReq 1)
-     ENDIF (EXISTS ${_missingFile})
+     ENDIF ()
 
 
      IF (NOT ${_missingDeps})
        SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.")
-     ENDIF (NOT ${_missingDeps})
+     ENDIF ()
 
 
      MESSAGE(${_summary})
@@ -139,8 +139,8 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
 
      IF(_haveMissingReq)
        MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")
-     ENDIF(_haveMissingReq)
+     ENDIF()
 
-   ENDIF(_printSummary)
+   ENDIF()
 
-ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)
+ENDMACRO()
diff --git a/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake b/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake
index d23d857b..c0d50d5e 100644
--- a/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake
+++ b/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake
@@ -18,4 +18,4 @@ get_filename_component(_currentListFileDir ${CMAKE_CURRENT_LIST_FILE} PATH)
 function(MACRO_WRITE_BASIC_CMAKE_VERSION_FILE _filename _version)
    set(PROJECT_VERSION_FULL ${_version})
    configure_file(${_currentListFileDir}/BasicFindPackageVersion.cmake.in "${_filename}" @ONLY)
-endfunction(MACRO_WRITE_BASIC_CMAKE_VERSION_FILE _major _minor _patch)
+endfunction()
diff --git a/cmake/modules/Qt5Macros.cmake b/cmake/modules/Qt5Macros.cmake
index e7eb0cbe..0a99e5bd 100644
--- a/cmake/modules/Qt5Macros.cmake
+++ b/cmake/modules/Qt5Macros.cmake
@@ -15,21 +15,21 @@ MACRO (QT5_GET_MOC_FLAGS _moc_flags)
     IF("${_current}" MATCHES "\\.framework/?$")
       STRING(REGEX REPLACE "/[^/]+\\.framework" "" framework_path "${_current}")
       SET(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
-    ELSE("${_current}" MATCHES "\\.framework/?$")
+    ELSE()
       SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
-    ENDIF("${_current}" MATCHES "\\.framework/?$")
-  ENDFOREACH(_current ${_inc_DIRS})
+    ENDIF()
+  ENDFOREACH()
 
   GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
   FOREACH(_current ${_defines})
     SET(${_moc_flags} ${${_moc_flags}} "-D${_current}")
-  ENDFOREACH(_current ${_defines})
+  ENDFOREACH()
 
   IF(Q_WS_WIN)
     SET(${_moc_flags} ${${_moc_flags}} -DWIN32)
-  ENDIF(Q_WS_WIN)
+  ENDIF()
 
-ENDMACRO (QT5_GET_MOC_FLAGS)
+ENDMACRO ()
 
 # helper macro to set up a moc rule
 MACRO (QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
@@ -44,7 +44,7 @@ MACRO (QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
     GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
     IF(_moc_outfile_dir)
       SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
-    ENDIF(_moc_outfile_dir)
+    ENDIF()
     SET (_moc_parameters_file ${outfile}_parameters)
     SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
     STRING (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
@@ -54,10 +54,10 @@ MACRO (QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
                        DEPENDS ${infile}
                        ${_moc_working_dir}
                        VERBATIM)
-  ELSE (WIN32)
+  ELSE ()
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
                        COMMAND ${QT_MOC_EXECUTABLE}
                        ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
                        DEPENDS ${infile})
-  ENDIF (WIN32)
-ENDMACRO (QT5_CREATE_MOC_COMMAND)
+  ENDIF ()
+ENDMACRO ()
diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
index dc98697d..443c3659 100644
--- a/cmake/modules/TelepathyDefaults.cmake
+++ b/cmake/modules/TelepathyDefaults.cmake
@@ -16,7 +16,7 @@ set(CMAKE_COLOR_MAKEFILE ON)
 # Add an option to decide where to install the config files
 if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
     option(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the <package>Config.cmake files to lib/cmake/<package> instead of lib/<package>/cmake" TRUE)
-endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
+endif ()
 
 # Set compiler flags
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -43,27 +43,27 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     CHECK_CXX_ACCEPTS_FLAG("-fvisibility=hidden" CXX_FVISIBILITY_HIDDEN)
     if (CXX_FVISIBILITY_HIDDEN)
         set(VISIBILITY_HIDDEN_FLAGS "-fvisibility=hidden")
-    else (CXX_FVISIBILITY_HIDDEN)
+    else ()
         set(VISIBILITY_HIDDEN_FLAGS)
-    endif (CXX_FVISIBILITY_HIDDEN)
+    endif ()
 
     CHECK_CXX_ACCEPTS_FLAG("-fvisibility-inlines-hidden" CXX_FVISIBILITY_INLINES_HIDDEN)
     if (CXX_FVISIBILITY_INLINES_HIDDEN)
         set(VISIBILITY_HIDDEN_FLAGS "${VISIBILITY_HIDDEN_FLAGS} -fvisibility-inlines-hidden")
-    endif (CXX_FVISIBILITY_INLINES_HIDDEN)
+    endif ()
 
     CHECK_CXX_ACCEPTS_FLAG("-Wdeprecated-declarations" CXX_DEPRECATED_DECLARATIONS)
     if (CXX_DEPRECATED_DECLARATIONS)
         set(DEPRECATED_DECLARATIONS_FLAGS "-Wdeprecated-declarations -DTP_QT_DEPRECATED_WARNINGS")
-    else (CXX_DEPRECATED_DECLARATIONS)
+    else ()
         set(DEPRECATED_DECLARATIONS_FLAGS)
-    endif (CXX_DEPRECATED_DECLARATIONS)
+    endif ()
 
     if(${TP_QT_NANO_VERSION} EQUAL 0)
         set(NOT_RELEASE 0)
-    else(${TP_QT_NANO_VERSION} EQUAL 0)
+    else()
         set(NOT_RELEASE 1)
-    endif(${TP_QT_NANO_VERSION} EQUAL 0)
+    endif()
 
     set(desired
         all
@@ -105,11 +105,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     if(${NOT_RELEASE} EQUAL 1)
         set(CMAKE_EXE_LINKER_FLAGS            "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed")
         set(CMAKE_SHARED_LINKER_FLAGS         "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-add-needed")
-    endif(${NOT_RELEASE} EQUAL 1)
+    endif()
 
     if(CMAKE_SYSTEM_NAME MATCHES Linux)
         add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE)
-    endif(CMAKE_SYSTEM_NAME MATCHES Linux)
+    endif()
 
     # Compiler coverage
     set(ENABLE_COMPILER_COVERAGE OFF CACHE BOOL "Enables compiler coverage tests through lcov. Enabling this option will build
@@ -124,16 +124,16 @@ Telepathy-Qt as a static library.")
             find_program(LCOV_GENHTML genhtml)
             if (NOT LCOV OR NOT LCOV_GENHTML)
                 message(FATAL_ERROR "You chose to use compiler coverage tests, but lcov or genhtml could not be found in your PATH.")
-            else (NOT LCOV OR NOT LCOV_GENHTML)
+            else ()
                 message(STATUS "Compiler coverage tests enabled - Telepathy-Qt will be compiled as a static library")
                 set(COMPILER_COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage")
-            endif (NOT LCOV OR NOT LCOV_GENHTML)
-        else (CXX_FPROFILE_ARCS AND CXX_FTEST_COVERAGE)
+            endif ()
+        else ()
             message(FATAL_ERROR "You chose to use compiler coverage tests, but it appears your compiler is not able to support them.")
-        endif (CXX_FPROFILE_ARCS AND CXX_FTEST_COVERAGE)
-    else (ENABLE_COMPILER_COVERAGE)
+        endif ()
+    else ()
         set(COMPILER_COVERAGE_FLAGS)
-    endif (ENABLE_COMPILER_COVERAGE)
+    endif ()
 
     # gcc under Windows
     if(MINGW)
@@ -145,12 +145,12 @@ Telepathy-Qt as a static library.")
         # or else QPluginLoader rejects plugins because it thinks
         # they're built against the wrong QT.
         add_definitions(-DQT_NO_DEBUG)
-    endif(MINGW)
-endif(CMAKE_COMPILER_IS_GNUCXX)
+    endif()
+endif()
 
 if(MSVC)
     set(ESCAPE_CHAR ^)
-endif(MSVC)
+endif()
 
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
 set(LIB_INSTALL_DIR     "lib${LIB_SUFFIX}"  CACHE PATH "The subdirectory where libraries will be installed (default is ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})" FORCE)
diff --git a/cmake/modules/TelepathyDist.cmake b/cmake/modules/TelepathyDist.cmake
index 7c179fdb..2f66552c 100644
--- a/cmake/modules/TelepathyDist.cmake
+++ b/cmake/modules/TelepathyDist.cmake
@@ -56,25 +56,25 @@ if (ENABLE_CPACK)
     set(CPACK_SOURCE_IGNORE_FILES
     "/build/;/.bzr/;~$;/.git/;/.kdev4/;${CPACK_SOURCE_IGNORE_FILES}")
     IF(WIN32 AND NOT UNIX)
-    # There is a bug in NSI that does not handle full unix paths properly. Make
-    # sure there is at least one set of four (4) backlasshes.
-    #SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
-    #SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\MyExecutable.exe")
-    SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} TelepathyQt")
-    #SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.github.com")
-    #SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.my-personal-home-page.com")
-    #SET(CPACK_NSIS_CONTACT "me@my-personal-home-page.com")
-    SET(CPACK_NSIS_MODIFY_PATH ON)
-    ELSE(WIN32 AND NOT UNIX)
-    #SET(CPACK_STRIP_FILES "bin/MyExecutable")
-    SET(CPACK_SOURCE_STRIP_FILES "")
-    ENDIF(WIN32 AND NOT UNIX)
+        # There is a bug in NSI that does not handle full unix paths properly. Make
+        # sure there is at least one set of four (4) backlasshes.
+        #SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
+        #SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\MyExecutable.exe")
+        SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} TelepathyQt")
+        #SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.github.com")
+        #SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.my-personal-home-page.com")
+        #SET(CPACK_NSIS_CONTACT "me@my-personal-home-page.com")
+        SET(CPACK_NSIS_MODIFY_PATH ON)
+    ELSE()
+        #SET(CPACK_STRIP_FILES "bin/MyExecutable")
+        SET(CPACK_SOURCE_STRIP_FILES "")
+    ENDIF()
     #SET(CPACK_PACKAGE_EXECUTABLES "MyExecutable" "My Executable")
 
     if (APPLE)
         set(CPACK_SET_DESTDIR ON)
         set(CPACK_PACKAGE_RELOCATABLE OFF)
-    endif (APPLE)
+    endif ()
 
     #name components
     set(CPACK_COMPONENT_MAINLIBRARY_DISPLAY_NAME "TelepathyQt main components")
@@ -107,4 +107,4 @@ if (ENABLE_CPACK)
     # Leave this as the last declaration, always!!!
     include(CPack)
 
-endif (ENABLE_CPACK)
+endif ()
diff --git a/cmake/modules/TpQtMacros.cmake b/cmake/modules/TpQtMacros.cmake
index 39b166ba..e5583240 100644
--- a/cmake/modules/TpQtMacros.cmake
+++ b/cmake/modules/TpQtMacros.cmake
@@ -128,15 +128,15 @@ MACRO (TPQT_EXTRACT_DEPENDS _tpqt_other _tpqt_depends)
   FOREACH(_currentArg ${ARGN})
     IF ("${_currentArg}" STREQUAL "DEPENDS")
       SET(_TPQT_DOING_DEPENDS TRUE)
-    ELSE ("${_currentArg}" STREQUAL "DEPENDS")
+    ELSE ()
       IF(_TPQT_DOING_DEPENDS)
         LIST(APPEND ${_tpqt_depends} "${_currentArg}")
-      ELSE(_TPQT_DOING_DEPENDS)
+      ELSE()
         LIST(APPEND ${_tpqt_other} "${_currentArg}")
-      ENDIF(_TPQT_DOING_DEPENDS)
-    ENDIF ("${_currentArg}" STREQUAL "DEPENDS")
-  ENDFOREACH(_currentArg)
-ENDMACRO (TPQT_EXTRACT_DEPENDS)
+      ENDIF()
+    ENDIF ()
+  ENDFOREACH()
+ENDMACRO ()
 
 # helper function to set up a moc rule
 FUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS infile outfile moc_flags moc_options)
@@ -151,28 +151,28 @@ FUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS infile outfile moc_flags moc_optio
     GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
     IF(_moc_outfile_dir)
       SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
-    ENDIF(_moc_outfile_dir)
+    ENDIF()
     SET (_moc_parameters_file ${outfile}_parameters)
     SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
     FILE (REMOVE ${_moc_parameters_file})
     FOREACH(arg ${_moc_parameters})
       FILE (APPEND ${_moc_parameters_file} "${arg}\n")
-    ENDFOREACH(arg)
+    ENDFOREACH()
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
                        COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
                        DEPENDS ${infile}
                        ${_moc_working_dir}
                        VERBATIM)
-  ELSE (WIN32)
+  ELSE ()
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
                        COMMAND ${QT_MOC_EXECUTABLE}
                        ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
                        DEPENDS ${infile})
-  ENDIF (WIN32)
+  ENDIF ()
 
   add_custom_target(moc-${_moc_outfile_name} DEPENDS ${outfile})
   add_dependencies(moc-${_moc_outfile_name} ${ARGN})
-ENDFUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS)
+ENDFUNCTION ()
 
 # add the -i option to QT_GENERATE_MOC
 function(TPQT_GENERATE_MOC_I infile outfile)
@@ -180,7 +180,7 @@ function(TPQT_GENERATE_MOC_I infile outfile)
     get_filename_component(abs_infile ${infile} ABSOLUTE)
     qt_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i")
     set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
-endfunction(TPQT_GENERATE_MOC_I)
+endfunction()
 
 # same as tpqt_generate_moc_i, but lets the caller specify a list of targets which the mocs should depend on
 function(TPQT_GENERATE_MOC_I_TARGET_DEPS infile outfile)
@@ -188,7 +188,7 @@ function(TPQT_GENERATE_MOC_I_TARGET_DEPS infile outfile)
     get_filename_component(abs_infile ${infile} ABSOLUTE)
     tpqt_create_moc_command_target_deps(${abs_infile} ${outfile} "${moc_flags}" "-i" ${ARGN})
     set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
-endfunction(TPQT_GENERATE_MOC_I_TARGET_DEPS)
+endfunction()
 
 # generates mocs for the passed list. The list should be added to the target's sources
 function(tpqt_generate_mocs)
@@ -197,8 +197,8 @@ function(tpqt_generate_mocs)
         string(REPLACE ".h" ".moc.hpp" generated_file ${moc_src})
         tpqt_generate_moc_i(${CMAKE_CURRENT_SOURCE_DIR}/${moc_src} ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file})
         set_property(SOURCE ${moc_src} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file})
-    endforeach(moc_src ${ARGN})
-endfunction(tpqt_generate_mocs)
+    endforeach()
+endfunction()
 
 function(tpqt_client_generator spec group pretty_include namespace)
     tpqt_extract_depends(client_generator_args client_generator_depends ${ARGN})
@@ -231,12 +231,12 @@ function(tpqt_client_generator spec group pretty_include namespace)
 
     if (client_generator_depends)
         add_dependencies(generate_cli-${spec}-body ${client_generator_depends})
-    endif (client_generator_depends)
+    endif ()
 
     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h
                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp
                        "generate_cli-${spec}-body")
-endfunction(tpqt_client_generator spec group pretty_include namespace)
+endfunction()
 
 function(tpqt_future_client_generator spec namespace)
     tpqt_extract_depends(future_client_generator_args future_client_generator_depends ${ARGN})
@@ -269,12 +269,12 @@ function(tpqt_future_client_generator spec namespace)
 
     if (future_client_generator_depends)
         add_dependencies(generate_future-${spec}-body ${future_client_generator_depends})
-    endif (future_client_generator_depends)
+    endif ()
 
     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h
                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.moc.hpp
                        "generate_future-${spec}-body")
-endfunction(tpqt_future_client_generator spec namespace)
+endfunction()
 
 function(tpqt_service_generator spec group pretty_include namespace)
     tpqt_extract_depends(service_generator_args service_generator_depends ${ARGN})
@@ -306,12 +306,12 @@ function(tpqt_service_generator spec group pretty_include namespace)
 
     if (service_generator_depends)
         add_dependencies(generate_service-${spec}-body ${service_generator_depends})
-    endif (service_generator_depends)
+    endif ()
 
     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h
                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.moc.hpp
                        "generate_service-${spec}-body")
-endfunction(tpqt_service_generator spec group pretty_include namespace)
+endfunction()
 
 # This function is used for generating CM in various examples
 function(tpqt_generate_manager_file MANAGER_FILE OUTPUT_FILENAME DEPEND_FILENAME)
@@ -330,7 +330,7 @@ function(tpqt_generate_manager_file MANAGER_FILE OUTPUT_FILENAME DEPEND_FILENAME
 
     set_source_files_properties(${DEPEND_FILENAME}
                                 PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/param-spec-struct.h)
-endfunction(tpqt_generate_manager_file MANAGER_FILE)
+endfunction()
 
 function(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
     tpqt_extract_depends(xincludator_gen_args xincludator_gen_depends ${ARGN})
@@ -352,8 +352,8 @@ function(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
 
     if (xincludator_gen_depends)
         add_dependencies(${_TARGET_NAME} ${xincludator_gen_depends})
-    endif (xincludator_gen_depends)
-endfunction(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
+    endif ()
+endfunction()
 
 function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
     tpqt_extract_depends(constants_gen_args constants_gen_depends ${ARGN})
@@ -377,8 +377,8 @@ function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
 
     if (constants_gen_depends)
         add_dependencies(${_TARGET_NAME} ${constants_gen_depends})
-    endif (constants_gen_depends)
-endfunction (tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
+    endif ()
+endfunction ()
 
 function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
     tpqt_extract_depends(types_gen_args types_gen_depends ${ARGN})
@@ -404,8 +404,8 @@ function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAME
 
     if (types_gen_depends)
         add_dependencies(${_TARGET_NAME} ${types_gen_depends})
-    endif (types_gen_depends)
-endfunction(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
+    endif ()
+endfunction()
 
 macro(tpqt_add_generic_unit_test _fancyName _name)
     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
@@ -416,7 +416,7 @@ macro(tpqt_add_generic_unit_test _fancyName _name)
 
     # Valgrind and Callgrind targets
     _tpqt_add_check_targets(${_fancyName} ${_name} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
-endmacro(tpqt_add_generic_unit_test _fancyName _name)
+endmacro()
 
 macro(tpqt_add_dbus_unit_test _fancyName _name)
     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
@@ -428,7 +428,7 @@ macro(tpqt_add_dbus_unit_test _fancyName _name)
 
     # Valgrind and Callgrind targets
     _tpqt_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
-endmacro(tpqt_add_dbus_unit_test _fancyName _name)
+endmacro()
 
 macro(_tpqt_add_check_targets _fancyName _name _runnerScript)
     set_tests_properties(${_fancyName}
@@ -480,7 +480,7 @@ macro(_tpqt_add_check_targets _fancyName _name _runnerScript)
         COMMENT
             "Running callgrind on test \"${_fancyName}\"")
     add_dependencies(check-callgrind check-callgrind-${_fancyName})
-endmacro(_tpqt_add_check_targets _fancyName _name)
+endmacro()
 
 function(tpqt_setup_dbus_test_environment)
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh "
@@ -488,12 +488,12 @@ ${test_environment}
 sh ${CMAKE_SOURCE_DIR}/tools/with-session-bus.sh \\
     --config-file=${CMAKE_BINARY_DIR}/tests/dbus-1/session.conf -- $@
 ")
-endfunction(tpqt_setup_dbus_test_environment)
+endfunction()
 
 macro(make_install_path_absolute out in)
     if (IS_ABSOLUTE "${in}")
         set(${out} "${in}")
-    else (IS_ABSOLUTE "${in}")
+    else ()
         set(${out} "\${TELEPATHY_QT${QT_VERSION_MAJOR}_INSTALL_DIR}/${in}")
-    endif (IS_ABSOLUTE "${in}")
-endmacro(make_install_path_absolute out in)
+    endif ()
+endmacro()