Remove CMake-language block-end command arguments

Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block.  This is no longer the preferred style.

Run the following shell code:

for c in else endif endforeach endfunction endmacro endwhile; do
    echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed

29 files changed, 149 insertions, 149 deletions

diff --git a/Modules/Platform/AIX.cmake b/Modules/Platform/AIX.cmake
index 78221b0..58c6483 100644
--- a/Modules/Platform/AIX.cmake
+++ b/Modules/Platform/AIX.cmake
@@ -24,6 +24,6 @@ set_property(GLOBAL PROPERTY TARGET_ARCHIVES_MAY_BE_SHARED_LIBS 1)
 #foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
 #  set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-bstatic")
 #  set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-bdynamic")
-#endforeach(type)
+#endforeach()
 
 include(Platform/UnixPaths)
diff --git a/Modules/Platform/BlueGeneL.cmake b/Modules/Platform/BlueGeneL.cmake
index b2158f5..082e46c 100644
--- a/Modules/Platform/BlueGeneL.cmake
+++ b/Modules/Platform/BlueGeneL.cmake
@@ -24,17 +24,17 @@ include(Platform/UnixPaths)
 if(CMAKE_COMPILER_IS_GNUCC)
   set(CMAKE_C_LINK_EXECUTABLE
     "<CMAKE_C_COMPILER> -Wl,-relax <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> -Wl,-lgcc,-lc -lnss_files -lnss_dns -lresolv")
-else(CMAKE_COMPILER_IS_GNUCC)
+else()
   # when using IBM xlc we probably don't want to link to -lgcc
   set(CMAKE_C_LINK_EXECUTABLE
     "<CMAKE_C_COMPILER> -Wl,-relax <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> -Wl,-lc -lnss_files -lnss_dns -lresolv")
-endif(CMAKE_COMPILER_IS_GNUCC)
+endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_LINK_EXECUTABLE
     "<CMAKE_CXX_COMPILER> -Wl,-relax <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> -Wl,-lstdc++,-lgcc,-lc -lnss_files -lnss_dns -lresolv")
-else(CMAKE_COMPILER_IS_GNUCXX)
+else()
   # when using the IBM xlC we probably don't want to link to -lgcc
   set(CMAKE_CXX_LINK_EXECUTABLE
     "<CMAKE_CXX_COMPILER> -Wl,-relax <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> -Wl,-lstdc++,-lc -lnss_files -lnss_dns -lresolv")
-endif(CMAKE_COMPILER_IS_GNUCXX)
+endif()
diff --git a/Modules/Platform/CYGWIN-GNU.cmake b/Modules/Platform/CYGWIN-GNU.cmake
index 2ec2219..fe25ab2 100644
--- a/Modules/Platform/CYGWIN-GNU.cmake
+++ b/Modules/Platform/CYGWIN-GNU.cmake
@@ -47,7 +47,7 @@ macro(__cygwin_compiler_gnu lang)
   foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
     set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-Bstatic")
     set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
-  endforeach(type)
+  endforeach()
 
   set(CMAKE_EXE_EXPORTS_${lang}_FLAG "-Wl,--export-all-symbols")
   # TODO: Is -Wl,--enable-auto-import now always default?
diff --git a/Modules/Platform/Darwin-icc.cmake b/Modules/Platform/Darwin-icc.cmake
index b8e1bdf..6a46f8e 100644
--- a/Modules/Platform/Darwin-icc.cmake
+++ b/Modules/Platform/Darwin-icc.cmake
@@ -13,7 +13,7 @@ if ( _OSX_VERSION MATCHES "^10.4" )
     set (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -gdwarf-2")
     set (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
     set (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
- # endif(CMAKE_COMPILER_IS_GNUCC)
+ # endif()
 
 #  if(CMAKE_COMPILER_IS_GNUCXX)
     set (CMAKE_CXX_FLAGS_INIT "")
@@ -23,8 +23,8 @@ if ( _OSX_VERSION MATCHES "^10.4" )
     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -gdwarf-2")
     set (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
     set (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
-#  endif(CMAKE_COMPILER_IS_GNUCXX)
-endif ( _OSX_VERSION MATCHES "^10.4" )
+#  endif()
+endif ()
 
 
 set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
@@ -54,17 +54,17 @@ if(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
   # if it is set.
   if(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
     set(_CMAKE_OSX_MACHINE "$ENV{CMAKE_OSX_ARCHITECTURES}")
-  endif(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
+  endif()
   # now put _CMAKE_OSX_MACHINE into the cache
   set(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE}
     CACHE STRING "Build architectures for OSX")
-endif(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+endif()
 
 
 if("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
   set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
     "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress")
-endif("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
+endif()
 
 if(NOT XCODE)
   # Enable shared library versioning.  This flag is not actually referenced
@@ -73,13 +73,13 @@ if(NOT XCODE)
   set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
   set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-install_name")
   set(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-install_name")
-endif(NOT XCODE)
+endif()
 
 # Xcode does not support -isystem yet.
 if(XCODE)
   set(CMAKE_INCLUDE_SYSTEM_FLAG_C)
   set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
-endif(XCODE)
+endif()
 
 set(CMAKE_MacOSX_Content_COMPILE_OBJECT "\"${CMAKE_COMMAND}\" -E copy_if_different <SOURCE> <OBJECT>")
 
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 8e665d1..2a5f3cf 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -17,8 +17,8 @@ if(NOT DEFINED HAVE_FLAG_SEARCH_PATHS_FIRST)
   set(HAVE_FLAG_SEARCH_PATHS_FIRST 0)
   if("${DARWIN_MAJOR_VERSION}" GREATER 6)
     set(HAVE_FLAG_SEARCH_PATHS_FIRST 1)
-  endif("${DARWIN_MAJOR_VERSION}" GREATER 6)
-endif(NOT DEFINED HAVE_FLAG_SEARCH_PATHS_FIRST)
+  endif()
+endif()
 # More desirable, but does not work:
   #include(CheckCXXCompilerFlag)
   #CHECK_CXX_COMPILER_FLAG("-Wl,-search_paths_first" HAVE_FLAG_SEARCH_PATHS_FIRST)
@@ -41,7 +41,7 @@ set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names")
 if(HAVE_FLAG_SEARCH_PATHS_FIRST)
   set(CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
-endif(HAVE_FLAG_SEARCH_PATHS_FIRST)
+endif()
 
 set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
 set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -Wl,-headerpad_max_install_names")
@@ -57,7 +57,7 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
 if(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
   find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
   mark_as_advanced(CMAKE_INSTALL_NAME_TOOL)
-endif(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+endif()
 
 # Set the assumed (Pre 10.5 or Default) location of the developer tools
 set(OSX_DEVELOPER_ROOT "/Developer")
@@ -69,7 +69,7 @@ if(CMAKE_XCODE_SELECT)
   execute_process(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
     OUTPUT_VARIABLE OSX_DEVELOPER_ROOT
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif(CMAKE_XCODE_SELECT)
+endif()
 
 # Find installed SDKs
 # Start with Xcode-4.3+ default SDKs directory
@@ -81,7 +81,7 @@ file(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*")
 if(NOT _CMAKE_OSX_SDKS)
 set(_CMAKE_OSX_SDKS_DIR "${OSX_DEVELOPER_ROOT}/SDKs")
   file(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*")
-endif(NOT _CMAKE_OSX_SDKS)
+endif()
 
 execute_process(COMMAND sw_vers -productVersion
   OUTPUT_VARIABLE CURRENT_OSX_VERSION
@@ -100,7 +100,7 @@ string(REGEX REPLACE "^([0-9]+\\.[0-9]+).*$" "\\1"
 if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
     "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
-endif(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+endif()
 
 #----------------------------------------------------------------------------
 # CMAKE_OSX_SYSROOT
@@ -117,19 +117,19 @@ set(CMAKE_OSX_SYSROOT_DEFAULT
 if(_CURRENT_OSX_VERSION STREQUAL "10.4")
   set(CMAKE_OSX_SYSROOT_DEFAULT
     "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.4u.sdk")
-endif(_CURRENT_OSX_VERSION STREQUAL "10.4")
+endif()
 
 if(_CURRENT_OSX_VERSION STREQUAL "10.3")
   set(CMAKE_OSX_SYSROOT_DEFAULT
     "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.3.9.sdk")
-endif(_CURRENT_OSX_VERSION STREQUAL "10.3")
+endif()
 
 # Use environment or default as initial cache value:
 if(NOT ENV_SDKROOT STREQUAL "")
   set(CMAKE_OSX_SYSROOT_VALUE ${ENV_SDKROOT})
-else(NOT ENV_SDKROOT STREQUAL "")
+else()
   set(CMAKE_OSX_SYSROOT_VALUE ${CMAKE_OSX_SYSROOT_DEFAULT})
-endif(NOT ENV_SDKROOT STREQUAL "")
+endif()
 
 # Set cache variable - end user may change this during ccmake or cmake-gui configure.
 set(CMAKE_OSX_SYSROOT ${CMAKE_OSX_SYSROOT_VALUE} CACHE PATH
@@ -149,7 +149,7 @@ function(SanityCheckSDKAndDeployTarget _sdk_path _deploy)
   if(_deploy GREATER "${SDK}")
     message(FATAL_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET (${_deploy}) is greater than CMAKE_OSX_SYSROOT SDK (${_sdk_path}). Please set CMAKE_OSX_DEPLOYMENT_TARGET to ${SDK} or lower")
   endif()
-endfunction(SanityCheckSDKAndDeployTarget)
+endfunction()
 #----------------------------------------------------------------------------
 
 # Make sure the combination of SDK and Deployment Target are allowed
@@ -163,15 +163,15 @@ execute_process(COMMAND uname -m
 # check for Power PC and change to ppc
 if(_CMAKE_OSX_MACHINE MATCHES "Power")
   set(_CMAKE_OSX_MACHINE ppc)
-endif(_CMAKE_OSX_MACHINE MATCHES "Power")
+endif()
 
 # check for environment variable CMAKE_OSX_ARCHITECTURES
 # if it is set.
 if(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
   set(CMAKE_OSX_ARCHITECTURES_VALUE "$ENV{CMAKE_OSX_ARCHITECTURES}")
-else(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
+else()
   set(CMAKE_OSX_ARCHITECTURES_VALUE "")
-endif(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
+endif()
 
 # now put _CMAKE_OSX_MACHINE into the cache
 set(CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES_VALUE} CACHE STRING
@@ -181,20 +181,20 @@ set(CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES_VALUE} CACHE STRING
 if("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
   set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
     "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress")
-endif("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
+endif()
 
 if(NOT XCODE)
   # Enable shared library versioning.  This flag is not actually referenced
   # but the fact that the setting exists will cause the generators to support
   # soname computation.
   set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
-endif(NOT XCODE)
+endif()
 
 # Xcode does not support -isystem yet.
 if(XCODE)
   set(CMAKE_INCLUDE_SYSTEM_FLAG_C)
   set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
-endif(XCODE)
+endif()
 
 if("${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5")
   # Need to list dependent shared libraries on link line.  When building
diff --git a/Modules/Platform/FreeBSD.cmake b/Modules/Platform/FreeBSD.cmake
index b577902..cf18501 100644
--- a/Modules/Platform/FreeBSD.cmake
+++ b/Modules/Platform/FreeBSD.cmake
@@ -10,7 +10,7 @@ if(EXISTS /usr/include/dlfcn.h)
   set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
   set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
   set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-endif(EXISTS /usr/include/dlfcn.h)
+endif()
 
 # Shared libraries with no builtin soname may not be linked safely by
 # specifying the file path.
@@ -23,6 +23,6 @@ set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-endforeach(type)
+endforeach()
 
 include(Platform/UnixPaths)
diff --git a/Modules/Platform/Generic-ADSP-Common.cmake b/Modules/Platform/Generic-ADSP-Common.cmake
index 9120eed..026f83c 100644
--- a/Modules/Platform/Generic-ADSP-Common.cmake
+++ b/Modules/Platform/Generic-ADSP-Common.cmake
@@ -18,66 +18,66 @@ if(NOT ADSP)
   # assume that this is the processor name to use for the compiler
   if(CMAKE_SYSTEM_PROCESSOR AND NOT ADSP_PROCESSOR)
     set(ADSP_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
-  endif(CMAKE_SYSTEM_PROCESSOR AND NOT ADSP_PROCESSOR)
+  endif()
 
   # if ADSP_PROCESSOR_SILICIUM_REVISION has not been set, use "none"
   if(NOT ADSP_PROCESSOR_SILICIUM_REVISION)
     set(ADSP_PROCESSOR_SILICIUM_REVISION "none")
-  endif(NOT ADSP_PROCESSOR_SILICIUM_REVISION)
+  endif()
 
   # this file is included from the C and CXX files, so handle both here
 
   get_filename_component(_ADSP_DIR "${CMAKE_C_COMPILER}" PATH)
   if(NOT _ADSP_DIR)
     get_filename_component(_ADSP_DIR "${CMAKE_CXX_COMPILER}" PATH)
-  endif(NOT _ADSP_DIR)
+  endif()
   if(NOT _ADSP_DIR)
     get_filename_component(_ADSP_DIR "${CMAKE_ASM_COMPILER}" PATH)
-  endif(NOT _ADSP_DIR)
+  endif()
 
   # detect architecture
 
   if(CMAKE_C_COMPILER MATCHES ccblkfn OR CMAKE_CXX_COMPILER MATCHES ccblkfn OR CMAKE_ASM_COMPILER MATCHES easmBLKFN)
     if(NOT ADSP_PROCESSOR)
       set(ADSP_PROCESSOR "ADSP-BF561")
-    endif(NOT ADSP_PROCESSOR)
+    endif()
     set(ADSP_BLACKFIN TRUE)
     set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/Blackfin")
-  endif(CMAKE_C_COMPILER MATCHES ccblkfn OR CMAKE_CXX_COMPILER MATCHES ccblkfn OR CMAKE_ASM_COMPILER MATCHES easmBLKFN)
+  endif()
 
   if(CMAKE_C_COMPILER MATCHES ccts OR CMAKE_CXX_COMPILER MATCHES ccts OR CMAKE_ASM_COMPILER MATCHES easmTS)
     if(NOT ADSP_PROCESSOR)
       set(ADSP_PROCESSOR "ADSP-TS101")
-    endif(NOT ADSP_PROCESSOR)
+    endif()
     set(ADSP_TS TRUE)
     set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/TS")
-  endif(CMAKE_C_COMPILER MATCHES ccts OR CMAKE_CXX_COMPILER MATCHES ccts OR CMAKE_ASM_COMPILER MATCHES easmTS)
+  endif()
 
   if(CMAKE_C_COMPILER MATCHES cc21k OR CMAKE_CXX_COMPILER MATCHES cc21k OR CMAKE_ASM_COMPILER MATCHES easm21k)
     if(NOT ADSP_PROCESSOR)
       set(ADSP_PROCESSOR "ADSP-21060")
-    endif(NOT ADSP_PROCESSOR)
+    endif()
     set(ADSP_21K TRUE)
 
     set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/21k")  # default if nothing matches
     if   (ADSP_PROCESSOR MATCHES "210..$")
       set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/21k")
-    endif(ADSP_PROCESSOR MATCHES "210..$")
+    endif()
 
     if   (ADSP_PROCESSOR MATCHES "211..$")
       set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/211k")
-    endif(ADSP_PROCESSOR MATCHES "211..$")
+    endif()
 
     if   (ADSP_PROCESSOR MATCHES "212..$")
       set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/212k")
-    endif(ADSP_PROCESSOR MATCHES "212..$")
+    endif()
 
     if   (ADSP_PROCESSOR MATCHES "213..$")
       set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/213k")
-    endif(ADSP_PROCESSOR MATCHES "213..$")
+    endif()
 
     set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/21k")
-  endif(CMAKE_C_COMPILER MATCHES cc21k OR CMAKE_CXX_COMPILER MATCHES cc21k OR CMAKE_ASM_COMPILER MATCHES easm21k)
+  endif()
 
 
   link_directories("${_ADSP_FAMILY_DIR}/lib")
@@ -91,7 +91,7 @@ if(NOT ADSP)
       COMMAND ${ADSP_VDKGEN_EXECUTABLE} ${VDK_KERNEL_SUPPORT_FILE} -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -MM
       DEPENDS ${VDK_KERNEL_SUPPORT_FILE}
       )
-  endmacro(ADSP_GENERATE_VDK VDK_GENERATED_HEADER VDK_GENERATED_SOURCE VDK_KERNEL_SUPPORT_FILE)
+  endmacro()
 
   # loader support
   find_program( ADSP_ELFLOADER_EXECUTABLE elfloader "${_ADSP_FAMILY_DIR}" )
@@ -106,7 +106,7 @@ if(NOT ADSP)
       COMMAND ${ADSP_ELFLOADER_EXECUTABLE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.dxe -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -b ${BOOT_MODE} -f ${FORMAT} -width ${WIDTH} -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.ldr
       COMMENT "Building the loader file"
       )
-  endmacro(ADSP_CREATE_LOADER_FILE TARGET_NAME BOOT_MODE FORMAT WIDTH)
+  endmacro()
 
   macro(ADSP_CREATE_LOADER_FILE_INIT TARGET_NAME BOOT_MODE FORMAT WIDTH INITIALIZATION_FILE)
     add_custom_command(
@@ -115,6 +115,6 @@ if(NOT ADSP)
       COMMAND ${ADSP_ELFLOADER_EXECUTABLE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.dxe -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -b ${BOOT_MODE} -f ${FORMAT} -width ${WIDTH} -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.ldr -init ${INITIALIZATION_FILE}
       COMMENT "Building the loader file"
       )
-  endmacro(ADSP_CREATE_LOADER_FILE_INIT TARGET_NAME BOOT_MODE FORMAT WIDTH INITIALIZATION_FILE)
+  endmacro()
 
-endif(NOT ADSP)
+endif()
diff --git a/Modules/Platform/Generic-SDCC-C.cmake b/Modules/Platform/Generic-SDCC-C.cmake
index fc7eb42..588bf32 100644
--- a/Modules/Platform/Generic-SDCC-C.cmake
+++ b/Modules/Platform/Generic-SDCC-C.cmake
@@ -31,11 +31,11 @@ set(CMAKE_AR "${SDCCLIB_EXECUTABLE}" CACHE FILEPATH "The sdcc librarian" FORCE)
 # CMAKE_C_FLAGS_INIT and CMAKE_EXE_LINKER_FLAGS_INIT should be set in a CMAKE_SYSTEM_PROCESSOR file
 if(NOT DEFINED CMAKE_C_FLAGS_INIT)
   set(CMAKE_C_FLAGS_INIT "-mmcs51 --model-small")
-endif(NOT DEFINED CMAKE_C_FLAGS_INIT)
+endif()
 
 if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_INIT)
   set (CMAKE_EXE_LINKER_FLAGS_INIT --model-small)
-endif(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_INIT)
+endif()
 
 # compile a C file into an object file
 set(CMAKE_C_COMPILE_OBJECT  "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index 33257f9..65cc731 100644
--- a/Modules/Platform/HP-UX.cmake
+++ b/Modules/Platform/HP-UX.cmake
@@ -38,13 +38,13 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 foreach(type SHARED_LIBRARY SHARED_MODULE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-a archive")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-a default")
-endforeach(type)
+endforeach()
 foreach(type EXE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-a,archive")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-a,default")
-endforeach(type)
+endforeach()
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_STATIC_CXX_FLAGS "-Wl,-a,archive")
   set(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Wl,-a,default")
-endforeach(type)
+endforeach()
 
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
index ec0b8fa..8987783 100644
--- a/Modules/Platform/Haiku.cmake
+++ b/Modules/Platform/Haiku.cmake
@@ -21,4 +21,4 @@ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH
     "Install path prefix, prepended onto install directories." FORCE)
-endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+endif()
diff --git a/Modules/Platform/IRIX.cmake b/Modules/Platform/IRIX.cmake
index 221a61d..03e98cc 100644
--- a/Modules/Platform/IRIX.cmake
+++ b/Modules/Platform/IRIX.cmake
@@ -11,7 +11,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCXX)
   set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
   set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2")
   set (CMAKE_C_FLAGS_INIT "")
-endif(NOT CMAKE_COMPILER_IS_GNUCXX)
+endif()
 # set flags for gcc support
 include(Platform/UnixPaths)
 
@@ -21,7 +21,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCC)
     "<CMAKE_C_COMPILER> <FLAGS> -S <SOURCE>"
     "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>"
     )
-endif(NOT CMAKE_COMPILER_IS_GNUCC)
+endif()
 
 if(NOT CMAKE_COMPILER_IS_GNUCXX)
   set (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
@@ -29,7 +29,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCXX)
     "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE>"
     "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>"
     )
-endif(NOT CMAKE_COMPILER_IS_GNUCXX)
+endif()
 
 # Initialize C link type selection flags.  These flags are used when
 # building a shared library, shared module, or executable that links
@@ -38,7 +38,7 @@ endif(NOT CMAKE_COMPILER_IS_GNUCXX)
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-endforeach(type)
+endforeach()
 
 # The IRIX linker needs to find transitive shared library dependencies
 # in the -L path.
diff --git a/Modules/Platform/IRIX64.cmake b/Modules/Platform/IRIX64.cmake
index 191dfcc..5acbd81 100644
--- a/Modules/Platform/IRIX64.cmake
+++ b/Modules/Platform/IRIX64.cmake
@@ -14,13 +14,13 @@ if(NOT CMAKE_COMPILER_IS_GNUCC)
 
   # If no -o32, -n32, or -64 flag is given, set a reasonable default.
   if("$ENV{CFLAGS} $ENV{CXXFLAGS} $ENV{LDFLAGS}" MATCHES "-([no]32|64)")
-  else("$ENV{CFLAGS} $ENV{CXXFLAGS} $ENV{LDFLAGS}" MATCHES "-([no]32|64)")
+  else()
     # Check if this is a 64-bit CMake.
     if(CMAKE_FILE_SELF MATCHES "^CMAKE_FILE_SELF$")
       exec_program(file ARGS ${CMAKE_COMMAND} OUTPUT_VARIABLE CMAKE_FILE_SELF)
       set(CMAKE_FILE_SELF "${CMAKE_FILE_SELF}" CACHE INTERNAL
         "Output of file command on ${CMAKE_COMMAND}.")
-    endif(CMAKE_FILE_SELF MATCHES "^CMAKE_FILE_SELF$")
+    endif()
 
     # Set initial flags to match cmake executable.
     if(CMAKE_FILE_SELF MATCHES " 64-bit ")
@@ -30,8 +30,8 @@ if(NOT CMAKE_COMPILER_IS_GNUCC)
       set(CMAKE_EXE_LINKER_FLAGS_INIT "-64")
       set(CMAKE_SHARED_LINKER_FLAGS_INIT "-64")
       set(CMAKE_MODULE_LINKER_FLAGS_INIT "-64")
-    endif(CMAKE_FILE_SELF MATCHES " 64-bit ")
-  endif("$ENV{CFLAGS} $ENV{CXXFLAGS} $ENV{LDFLAGS}" MATCHES "-([no]32|64)")
+    endif()
+  endif()
 
   # Set remaining defaults.
   set(CMAKE_CXX_CREATE_STATIC_LIBRARY
@@ -40,7 +40,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCC)
   set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3 -DNDEBUG")
   set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
   set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2")
-endif(NOT CMAKE_COMPILER_IS_GNUCC)
+endif()
 include(Platform/UnixPaths)
 
 if(NOT CMAKE_COMPILER_IS_GNUCC)
@@ -49,7 +49,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCC)
     "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -S <SOURCE>"
     "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>"
     )
-endif(NOT CMAKE_COMPILER_IS_GNUCC)
+endif()
 
 if(NOT CMAKE_COMPILER_IS_GNUCXX)
   set (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
@@ -57,7 +57,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCXX)
     "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S <SOURCE>"
     "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>"
     )
-endif(NOT CMAKE_COMPILER_IS_GNUCXX)
+endif()
 
 # Initialize C link type selection flags.  These flags are used when
 # building a shared library, shared module, or executable that links
@@ -66,7 +66,7 @@ endif(NOT CMAKE_COMPILER_IS_GNUCXX)
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-endforeach(type)
+endforeach()
 
 # The IRIX linker needs to find transitive shared library dependencies
 # in the -L path.
diff --git a/Modules/Platform/Linux-Intel.cmake b/Modules/Platform/Linux-Intel.cmake
index 47bf246..2394f10 100644
--- a/Modules/Platform/Linux-Intel.cmake
+++ b/Modules/Platform/Linux-Intel.cmake
@@ -28,7 +28,7 @@ if(NOT XIAR)
   endforeach()
   find_program(XIAR NAMES xiar HINTS ${_intel_xiar_hints})
   mark_as_advanced(XIAR)
-endif(NOT XIAR)
+endif()
 
 macro(__linux_compiler_intel lang)
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
index c1dc642..fe8e003 100644
--- a/Modules/Platform/Linux.cmake
+++ b/Modules/Platform/Linux.cmake
@@ -16,7 +16,7 @@ set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-endforeach(type)
+endforeach()
 
 # Debian policy requires that shared libraries be installed without
 # executable permission.  Fedora policy requires that shared libraries
@@ -31,7 +31,7 @@ if(DEFINED CMAKE_INSTALL_SO_NO_EXE)
   # setting the user provides on the command line.
   set(CMAKE_INSTALL_SO_NO_EXE "${CMAKE_INSTALL_SO_NO_EXE}" CACHE INTERNAL
     "Install .so files without execute permission.")
-else(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+else()
   # Store the decision variable as an internal cache entry to avoid
   # checking the platform every time.  This option is advanced enough
   # that only package maintainers should need to adjust it.  They are
@@ -39,11 +39,11 @@ else(DEFINED CMAKE_INSTALL_SO_NO_EXE)
   if(EXISTS "/etc/debian_version")
     set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
       "Install .so files without execute permission.")
-  else(EXISTS "/etc/debian_version")
+  else()
     set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
       "Install .so files without execute permission.")
-  endif(EXISTS "/etc/debian_version")
-endif(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+  endif()
+endif()
 
 # Match multiarch library directory names.
 set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
@@ -54,4 +54,4 @@ include(Platform/UnixPaths)
 # searched.
 if(EXISTS "/etc/debian_version")
   set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-endif(EXISTS "/etc/debian_version")
+endif()
diff --git a/Modules/Platform/MP-RAS.cmake b/Modules/Platform/MP-RAS.cmake
index ae5fa61..fe8d81a 100644
--- a/Modules/Platform/MP-RAS.cmake
+++ b/Modules/Platform/MP-RAS.cmake
@@ -2,12 +2,12 @@ if(CMAKE_SYSTEM MATCHES "MP-RAS-02*.")
   set(CMAKE_C_COMPILE_OPTIONS_PIC -K PIC)
   set(CMAKE_C_COMPILE_OPTIONS_PIE -K PIE)
   set(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
-else(CMAKE_SYSTEM MATCHES "MP-RAS-02*.")
+else()
   set(CMAKE_C_COMPILE_OPTIONS_PIC -K PIC)
   set(CMAKE_C_COMPILE_OPTIONS_PIE -K PIE)
   set(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
   set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-Bexport")
-endif(CMAKE_SYSTEM MATCHES "MP-RAS-02*.")
+endif()
 
 include(Platform/UnixPaths)
 
diff --git a/Modules/Platform/NetBSD.cmake b/Modules/Platform/NetBSD.cmake
index 24dd15c..7318275 100644
--- a/Modules/Platform/NetBSD.cmake
+++ b/Modules/Platform/NetBSD.cmake
@@ -10,6 +10,6 @@ if(EXISTS /usr/include/dlfcn.h)
   set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
   set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
   set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-endif(EXISTS /usr/include/dlfcn.h)
+endif()
 
 include(Platform/UnixPaths)
diff --git a/Modules/Platform/OSF1.cmake b/Modules/Platform/OSF1.cmake
index e720e40..9c3255e 100644
--- a/Modules/Platform/OSF1.cmake
+++ b/Modules/Platform/OSF1.cmake
@@ -1,14 +1,14 @@
 set(CMAKE_DL_LIBS "")
 
 if(CMAKE_SYSTEM MATCHES "OSF1-1.[012]")
-endif(CMAKE_SYSTEM MATCHES "OSF1-1.[012]")
+endif()
 if(CMAKE_SYSTEM MATCHES "OSF1-1.*")
   # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
   set(CMAKE_C_COMPILE_OPTIONS_PIC "-fpic")
   set(CMAKE_C_COMPILE_OPTIONS_PIE "-fpie")
   set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fpic")     # -pic
   set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fpic")   # -pic
-endif(CMAKE_SYSTEM MATCHES "OSF1-1.*")
+endif()
 
 
 
@@ -16,22 +16,22 @@ if(CMAKE_SYSTEM MATCHES "OSF1-V.*")
   set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-expect_unresolved,\\*")       # -shared
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-Wl,-rpath,")
-  else(CMAKE_COMPILER_IS_GNUCXX)
+  else()
     set(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-rpath ")
-  endif(CMAKE_COMPILER_IS_GNUCXX)
+  endif()
   if(CMAKE_COMPILER_IS_GNUCC)
     set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
-  else(CMAKE_COMPILER_IS_GNUCC)
+  else()
     set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-rpath ")
-  endif(CMAKE_COMPILER_IS_GNUCC)
+  endif()
   set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-endif(CMAKE_SYSTEM MATCHES "OSF1-V.*")
+endif()
 
 set(CMAKE_MAKE_INCLUDE_FROM_ROOT 1) # include $(CMAKE_BINARY_DIR)/...
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   # include the gcc flags
-else (CMAKE_COMPILER_IS_GNUCXX)
+else ()
   # use default OSF compiler flags
   set (CMAKE_C_FLAGS_INIT "")
   set (CMAKE_C_FLAGS_DEBUG_INIT "-g")
@@ -43,5 +43,5 @@ else (CMAKE_COMPILER_IS_GNUCXX)
   set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O2 -DNDEBUG")
   set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
   set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2")
-endif(CMAKE_COMPILER_IS_GNUCXX)
+endif()
 include(Platform/UnixPaths)
diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake
index fedc0b4..2598411 100644
--- a/Modules/Platform/QNX.cmake
+++ b/Modules/Platform/QNX.cmake
@@ -25,7 +25,7 @@ set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-endforeach(type)
+endforeach()
 # force the language to be c++ since qnx only has gcc and not g++ and c++?
 set(CMAKE_CXX_COMPILE_OBJECT
   "<CMAKE_CXX_COMPILER> -x c++ <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
index a1fc72f..da20f97 100644
--- a/Modules/Platform/SunOS.cmake
+++ b/Modules/Platform/SunOS.cmake
@@ -5,23 +5,23 @@ if(CMAKE_SYSTEM MATCHES "SunOS-4.*")
    set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-r")
    set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R")
    set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-endif(CMAKE_SYSTEM MATCHES "SunOS-4.*")
+endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   if(CMAKE_COMPILER_IS_GNUCC)
     set(CMAKE_CXX_CREATE_SHARED_LIBRARY
         "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-  else(CMAKE_COMPILER_IS_GNUCC)
+  else()
     # Take default rule from CMakeDefaultMakeRuleVariables.cmake.
-  endif(CMAKE_COMPILER_IS_GNUCC)
-endif(CMAKE_COMPILER_IS_GNUCXX)
+  endif()
+endif()
 include(Platform/UnixPaths)
 
 # Add the compiler's implicit link directories.
 if("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
   list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
     /opt/SUNWspro/lib /opt/SUNWspro/prod/lib /usr/ccs/lib)
-endif("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
+endif()
 
 # The Sun linker needs to find transitive shared library dependencies
 # in the -L path.
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index 4a37eca..50ba80b 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -74,7 +74,7 @@ macro(__windows_compiler_gnu lang)
     foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
       set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-Bstatic")
       set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
-    endforeach(type)
+    endforeach()
   endif()
 
   # No -fPIC on Windows
diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake
index ec78886..3370557 100644
--- a/Modules/Platform/Windows-Intel.cmake
+++ b/Modules/Platform/Windows-Intel.cmake
@@ -27,9 +27,9 @@ set(CMAKE_LINK_LIBRARY_FLAG "")
 set(WIN32 1)
 if(CMAKE_VERBOSE_MAKEFILE)
   set(CMAKE_CL_NOLOGO)
-else(CMAKE_VERBOSE_MAKEFILE)
+else()
   set(CMAKE_CL_NOLOGO "/nologo")
-endif(CMAKE_VERBOSE_MAKEFILE)
+endif()
 set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
 set(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
 set(CMAKE_CREATE_CONSOLE_EXE /subsystem:console)
@@ -69,15 +69,15 @@ if(NOT _INTEL_XILINK_TEST_RUN)
     OUTPUT_VARIABLE _XILINK_HELP)
   if(_XILINK_HELP MATCHES MANIFEST)
     set(_INTEL_COMPILER_SUPPORTS_MANIFEST 1)
-  endif(_XILINK_HELP MATCHES MANIFEST)
+  endif()
   if(NOT  EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeIntelInformation.cmake")
     file(WRITE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeIntelInformation.cmake
       "
 set(_INTEL_XILINK_TEST_RUN 1)
 set(_INTEL_COMPILER_SUPPORTS_MANIFEST ${_INTEL_COMPILER_SUPPORTS_MANIFEST})
 ")
-  endif(NOT  EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeIntelInformation.cmake")
-endif(NOT _INTEL_XILINK_TEST_RUN)
+  endif()
+endif()
 
 macro(__windows_compiler_intel lang)
   set(CMAKE_${lang}_COMPILE_OBJECT
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake
index 216419f..05df946 100644
--- a/Modules/Platform/Windows-cl.cmake
+++ b/Modules/Platform/Windows-cl.cmake
@@ -12,17 +12,17 @@ set(CMAKE_CREATE_CONSOLE_EXE /subsystem:console)
 
 if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
    set (CMAKE_NO_BUILD_TYPE 1)
-endif(CMAKE_GENERATOR MATCHES "Visual Studio 6")
+endif()
 if(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio")
   set (CMAKE_NO_BUILD_TYPE 1)
   set (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING
      "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.")
   mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
-endif(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio")
+endif()
 # does the compiler support pdbtype and is it the newer compiler
 if(CMAKE_GENERATOR MATCHES  "Visual Studio 8")
   set(CMAKE_COMPILER_2005 1)
-endif(CMAKE_GENERATOR MATCHES  "Visual Studio 8")
+endif()
 
 # make sure to enable languages after setting configuration types
 enable_language(RC)
@@ -48,7 +48,7 @@ if(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
     set(CMAKE_TEST_COMPILER ${CMAKE_C_COMPILER})
     if (NOT CMAKE_C_COMPILER)
       set(CMAKE_TEST_COMPILER ${CMAKE_CXX_COMPILER})
-    endif(NOT CMAKE_C_COMPILER)
+    endif()
     exec_program(${CMAKE_TEST_COMPILER}
       ARGS /nologo -EP \"${testNmakeCLVersionFile}\"
       OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
@@ -70,32 +70,32 @@ if(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
       if("${compilerVersion}" LESS 1300)
         set(MSVC60 1)
         set(CMAKE_COMPILER_SUPPORTS_PDBTYPE 1)
-      endif("${compilerVersion}" LESS 1300)
+      endif()
       if("${compilerVersion}" EQUAL 1300)
         set(MSVC70 1)
         set(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0)
-      endif("${compilerVersion}" EQUAL 1300)
+      endif()
       if("${compilerVersion}" EQUAL 1310)
         set(MSVC71 1)
         set(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0)
-      endif("${compilerVersion}" EQUAL 1310)
+      endif()
       if("${compilerVersion}" EQUAL 1400)
         set(MSVC80 1)
         set(CMAKE_COMPILER_2005 1)
-      endif("${compilerVersion}" EQUAL 1400)
+      endif()
       if("${compilerVersion}" EQUAL 1500)
         set(MSVC90 1)
-      endif("${compilerVersion}" EQUAL 1500)
+      endif()
       if("${compilerVersion}" EQUAL 1600)
         set(MSVC10 1)
-      endif("${compilerVersion}" EQUAL 1600)
+      endif()
       set(MSVC_VERSION "${compilerVersion}")
-    else(NOT CMAKE_COMPILER_RETURN)
+    else()
       message(STATUS "Check for CL compiler version - failed")
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
         "Determining the version of compiler failed with the following output:\n"
         "${CMAKE_COMPILER_OUTPUT}\n\n")
-    endif(NOT CMAKE_COMPILER_RETURN)
+    endif()
     # try to figure out if we are running the free command line
     # tools from Microsoft.  These tools do not provide debug libraries,
     # so the link flags used have to be different.
@@ -116,25 +116,25 @@ if(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
         "${CMAKE_COMPILER_OUTPUT}\n\n")
       message(STATUS "Check if this is a free VC compiler - yes")
       set(CMAKE_USING_VC_FREE_TOOLS 1)
-    else(CMAKE_COMPILER_RETURN)
+    else()
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
         "Determining if this is a free VC compiler passed with the following output:\n"
         "${CMAKE_COMPILER_OUTPUT}\n\n")
       message(STATUS "Check if this is a free VC compiler - no")
       set(CMAKE_USING_VC_FREE_TOOLS 0)
-    endif(CMAKE_COMPILER_RETURN)
+    endif()
     make_directory("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3")
-  endif(NOT CMAKE_VC_COMPILER_TESTS_RUN)
-endif(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
+  endif()
+endif()
 
 if(MSVC_C_ARCHITECTURE_ID MATCHES 64)
   set(CMAKE_CL_64 1)
-else(MSVC_C_ARCHITECTURE_ID MATCHES 64)
+else()
   set(CMAKE_CL_64 0)
-endif(MSVC_C_ARCHITECTURE_ID MATCHES 64)
+endif()
 if(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64)
   set(CMAKE_CL_64 1)
-endif(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64)
+endif()
 
 if("${MSVC_VERSION}" GREATER 1599)
   set(MSVC_INCREMENTAL_DEFAULT ON)
@@ -165,7 +165,7 @@ if(MSVC_VERSION GREATER 1310)
   set (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
   set (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ")
   set (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}")
-else(MSVC_VERSION GREATER 1310)
+else()
   if(CMAKE_USING_VC_FREE_TOOLS)
     message(STATUS "Using FREE VC TOOLS, NO DEBUG available")
     set(CMAKE_BUILD_TYPE_INIT Release)
@@ -179,7 +179,7 @@ else(MSVC_VERSION GREATER 1310)
     set (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG")
     set (CMAKE_C_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG")
     set (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG")
-  else(CMAKE_USING_VC_FREE_TOOLS)
+  else()
     set(CMAKE_BUILD_TYPE_INIT Debug)
     set (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR")
     set (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od /GZ")
@@ -191,9 +191,9 @@ else(MSVC_VERSION GREATER 1310)
     set (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
     set (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG")
     set (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
-  endif(CMAKE_USING_VC_FREE_TOOLS)
+  endif()
   set (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
-endif(MSVC_VERSION GREATER 1310)
+endif()
 
 set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 
@@ -203,7 +203,7 @@ set (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
 set(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID})
 if(NOT _MACHINE_ARCH_FLAG)
   set(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID})
-endif(NOT _MACHINE_ARCH_FLAG)
+endif()
 set (CMAKE_EXE_LINKER_FLAGS_INIT
     "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}")
 
@@ -219,10 +219,10 @@ endif()
 if (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
   set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}")
   set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}")
-else (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
+else ()
   set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}")
   set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}")
-endif (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
+endif ()
 # for release and minsize release default to no incremental linking
 set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO")
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO")
@@ -245,9 +245,9 @@ set (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZER
 if(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake")
   configure_file(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in
     ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCPlatform.cmake IMMEDIATE)
-endif(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake")
+endif()
 
 if(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake")
   configure_file(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in
                ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE)
-endif(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake")
+endif()
diff --git a/Modules/Platform/Windows-df.cmake b/Modules/Platform/Windows-df.cmake
index dff58c5..9a87be1 100644
--- a/Modules/Platform/Windows-df.cmake
+++ b/Modules/Platform/Windows-df.cmake
@@ -6,9 +6,9 @@ set(CMAKE_LINK_LIBRARY_FLAG "")
 set(WIN32 1)
 if(CMAKE_VERBOSE_MAKEFILE)
   set(CMAKE_CL_NOLOGO)
-else(CMAKE_VERBOSE_MAKEFILE)
+else()
   set(CMAKE_CL_NOLOGO "/nologo")
-endif(CMAKE_VERBOSE_MAKEFILE)
+endif()
 
 set(CMAKE_Fortran_MODDIR_FLAG "-module:")
 
@@ -34,12 +34,12 @@ set(CMAKE_CREATE_CONSOLE_EXE )
 
 if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
    set (CMAKE_NO_BUILD_TYPE 1)
-endif(CMAKE_GENERATOR MATCHES "Visual Studio 6")
+endif()
 if(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8")
   set (CMAKE_NO_BUILD_TYPE 1)
   set (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING
      "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.")
-endif(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8")
+endif()
 # does the compiler support pdbtype and is it the newer compiler
 
 set(CMAKE_BUILD_TYPE_INIT Debug)
@@ -57,10 +57,10 @@ set (CMAKE_EXE_LINKER_FLAGS_INIT " /INCREMENTAL:YES")
 if (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
   set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept")
   set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept")
-else (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
+else ()
   set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug")
   set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug")
-endif (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
+endif ()
 
 set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index 977531d..8a03b29 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -6,11 +6,11 @@ if(CMAKE_VERBOSE_MAKEFILE)
   set(CMAKE_WCL_QUIET)
   set(CMAKE_WLINK_QUIET)
   set(CMAKE_LIB_QUIET)
-else(CMAKE_VERBOSE_MAKEFILE)
+else()
   set(CMAKE_WCL_QUIET "-zq")
   set(CMAKE_WLINK_QUIET "option quiet")
   set(CMAKE_LIB_QUIET "-q")
-endif(CMAKE_VERBOSE_MAKEFILE)
+endif()
 
 set(CMAKE_CREATE_WIN32_EXE "system nt_win" )
 set(CMAKE_CREATE_CONSOLE_EXE "system nt" )
diff --git a/Modules/Platform/Windows.cmake b/Modules/Platform/Windows.cmake
index 9481baa..b158a9d 100644
--- a/Modules/Platform/Windows.cmake
+++ b/Modules/Platform/Windows.cmake
@@ -18,14 +18,14 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
 if(CMAKE_GENERATOR MATCHES "Borland")
   set(CMAKE_START_TEMP_FILE "@&&|\n")
   set(CMAKE_END_TEMP_FILE "\n|")
-endif(CMAKE_GENERATOR MATCHES "Borland")
+endif()
 
 # for nmake make long command lines are redirected to a file
 # with the following syntax, see Windows-bcc32.cmake for use
 if(CMAKE_GENERATOR MATCHES "NMake")
   set(CMAKE_START_TEMP_FILE "@<<\n")
   set(CMAKE_END_TEMP_FILE "\n<<")
-endif(CMAKE_GENERATOR MATCHES "NMake")
+endif()
 
 include(Platform/WindowsPaths)
 
diff --git a/Modules/Platform/cl.cmake b/Modules/Platform/cl.cmake
index c8dc025..9e4d607 100644
--- a/Modules/Platform/cl.cmake
+++ b/Modules/Platform/cl.cmake
@@ -8,13 +8,13 @@ set(MSVC 1)
 # hardcode CMAKE_LINKER here to link, so it behaves as it did before, Alex
 if(NOT DEFINED CMAKE_LINKER)
    set(CMAKE_LINKER link)
-endif(NOT DEFINED CMAKE_LINKER)
+endif()
 
 if(CMAKE_VERBOSE_MAKEFILE)
   set(CMAKE_CL_NOLOGO)
-else(CMAKE_VERBOSE_MAKEFILE)
+else()
   set(CMAKE_CL_NOLOGO "/nologo")
-endif(CMAKE_VERBOSE_MAKEFILE)
+endif()
 # create a shared C++ library
 set(CMAKE_CXX_CREATE_SHARED_LIBRARY
   "<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
diff --git a/Modules/Platform/eCos.cmake b/Modules/Platform/eCos.cmake
index c839b0e..a203826 100644
--- a/Modules/Platform/eCos.cmake
+++ b/Modules/Platform/eCos.cmake
@@ -30,10 +30,10 @@ include(Platform/UnixPaths)
 get_property(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE)
 if(CMAKE_C_COMPILER AND NOT  "${CMAKE_C_COMPILER_ID}" MATCHES "GNU" AND NOT _IN_TC)
   message(FATAL_ERROR "GNU gcc is required for eCos")
-endif(CMAKE_C_COMPILER AND NOT  "${CMAKE_C_COMPILER_ID}" MATCHES "GNU" AND NOT _IN_TC)
+endif()
 if(CMAKE_CXX_COMPILER AND NOT  "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" AND NOT _IN_TC)
   message(FATAL_ERROR "GNU g++ is required for eCos")
-endif(CMAKE_CXX_COMPILER AND NOT  "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" AND NOT _IN_TC)
+endif()
 
 # find eCos system files
 find_path(ECOS_SYSTEM_CONFIG_HEADER_PATH NAMES pkgconf/system.h)
@@ -41,11 +41,11 @@ find_library(ECOS_SYSTEM_TARGET_LIBRARY NAMES libtarget.a)
 
 if(NOT ECOS_SYSTEM_CONFIG_HEADER_PATH)
   message(FATAL_ERROR "Could not find eCos pkgconf/system.h. Build eCos first and set up CMAKE_FIND_ROOT_PATH correctly.")
-endif(NOT ECOS_SYSTEM_CONFIG_HEADER_PATH)
+endif()
 
 if(NOT ECOS_SYSTEM_TARGET_LIBRARY)
   message(FATAL_ERROR "Could not find eCos \"libtarget.a\". Build eCos first and set up CMAKE_FIND_ROOT_PATH correctly.")
-endif(NOT ECOS_SYSTEM_TARGET_LIBRARY)
+endif()
 
 get_filename_component(ECOS_LIBTARGET_DIRECTORY "${ECOS_SYSTEM_TARGET_LIBRARY}" PATH)
 include_directories(${ECOS_SYSTEM_CONFIG_HEADER_PATH})
diff --git a/Modules/Platform/gas.cmake b/Modules/Platform/gas.cmake
index 6ac3b55..7d2bc84 100644
--- a/Modules/Platform/gas.cmake
+++ b/Modules/Platform/gas.cmake
@@ -1,8 +1,8 @@
 if(UNIX)
   set(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .o)
-else(UNIX)
+else()
   set(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .obj)
-endif(UNIX)
+endif()
 
 set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>")
 
diff --git a/Modules/Platform/syllable.cmake b/Modules/Platform/syllable.cmake
index 50c695f..69c108d 100644
--- a/Modules/Platform/syllable.cmake
+++ b/Modules/Platform/syllable.cmake
@@ -25,7 +25,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-endforeach(type)
+endforeach()
 
 include(Platform/UnixPaths)