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

1 files changed, 30 insertions, 30 deletions

diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake
index d7d3cf8..c85cfb4 100644
--- a/Modules/CPackComponent.cmake
+++ b/Modules/CPackComponent.cmake
@@ -283,10 +283,10 @@ macro(cpack_parse_arguments prefix arg_names option_names)
   set(${prefix}_DEFAULT_ARGS)
   foreach(arg_name ${arg_names})
     set(${prefix}_${arg_name})
-  endforeach(arg_name)
+  endforeach()
   foreach(option ${option_names})
     set(${prefix}_${option} FALSE)
-  endforeach(option)
+  endforeach()
 
   set(current_arg_name DEFAULT_ARGS)
   set(current_arg_list)
@@ -297,18 +297,18 @@ macro(cpack_parse_arguments prefix arg_names option_names)
       set(${prefix}_${current_arg_name} ${current_arg_list})
       set(current_arg_name ${arg})
       set(current_arg_list)
-    else (is_arg_name GREATER -1)
+    else ()
       set(loption_names ${option_names})
       list(FIND loption_names "${arg}" is_option)
       if (is_option GREATER -1)
         set(${prefix}_${arg} TRUE)
-      else (is_option GREATER -1)
+      else ()
         set(current_arg_list ${current_arg_list} ${arg})
-      endif (is_option GREATER -1)
-    endif (is_arg_name GREATER -1)
-  endforeach(arg)
+      endif ()
+    endif ()
+  endforeach()
   set(${prefix}_${current_arg_name} ${current_arg_list})
-endmacro(cpack_parse_arguments)
+endmacro()
 
 # Macro that appends a SET command for the given variable name (var)
 # to the macro named strvar, but only if the variable named "var"
@@ -319,10 +319,10 @@ macro(cpack_append_variable_set_command var strvar)
     set(${strvar} "${${strvar}}set(${var}")
     foreach(APPENDVAL ${${var}})
       set(${strvar} "${${strvar}} ${APPENDVAL}")
-    endforeach(APPENDVAL)
+    endforeach()
     set(${strvar} "${${strvar}})\n")
-  endif (DEFINED ${var})
-endmacro(cpack_append_variable_set_command)
+  endif ()
+endmacro()
 
 # Macro that appends a SET command for the given variable name (var)
 # to the macro named strvar, but only if the variable named "var"
@@ -333,9 +333,9 @@ macro(cpack_append_string_variable_set_command var strvar)
     list(LENGTH ${var} CPACK_APP_VALUE_LEN)
     if(${CPACK_APP_VALUE_LEN} EQUAL 1)
       set(${strvar} "${${strvar}}set(${var} \"${${var}}\")\n")
-    endif(${CPACK_APP_VALUE_LEN} EQUAL 1)
-  endif (DEFINED ${var})
-endmacro(cpack_append_string_variable_set_command)
+    endif()
+  endif ()
+endmacro()
 
 # Macro that appends a SET command for the given variable name (var)
 # to the macro named strvar, but only if the variable named "var"
@@ -346,9 +346,9 @@ macro(cpack_append_option_set_command var strvar)
     list(LENGTH ${var} CPACK_APP_VALUE_LEN)
     if(${CPACK_APP_VALUE_LEN} EQUAL 1)
       set(${strvar} "${${strvar}}set(${var} TRUE)\n")
-    endif(${CPACK_APP_VALUE_LEN} EQUAL 1)
-  endif (${var})
-endmacro(cpack_append_option_set_command)
+    endif()
+  endif ()
+endmacro()
 
 # Macro that adds a component to the CPack installer
 macro(cpack_add_component compname)
@@ -375,10 +375,10 @@ macro(cpack_add_component compname)
       set(CPACK_ADDCOMP_STR "${CPACK_ADDCOMP_STR}\nSET(CPACK_COMPONENTS_ALL")
       foreach(COMP ${CPACK_ADDCOMP_COMPONENTS})
        set(CPACK_ADDCOMP_STR "${CPACK_ADDCOMP_STR} ${COMP}")
-      endforeach(COMP)
+      endforeach()
       set(CPACK_ADDCOMP_STR "${CPACK_ADDCOMP_STR})\n")
-    endif(NOT CPACK_COMPONENTS_ALL_SET_BY_USER)
-  endif(NOT CPACK_MONOLITHIC_INSTALL)
+    endif()
+  endif()
 
   cpack_append_string_variable_set_command(
     CPACK_COMPONENT_${CPACK_ADDCOMP_UNAME}_DISPLAY_NAME
@@ -416,8 +416,8 @@ macro(cpack_add_component compname)
   # will be encoded by cpack_encode_variables.
   if(CPack_CMake_INCLUDED)
     file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${CPACK_ADDCOMP_STR}")
-  endif(CPack_CMake_INCLUDED)
-endmacro(cpack_add_component)
+  endif()
+endmacro()
 
 # Macro that adds a component group to the CPack installer
 macro(cpack_add_component_group grpname)
@@ -447,8 +447,8 @@ macro(cpack_add_component_group grpname)
   # will be encoded by cpack_encode_variables.
   if(CPack_CMake_INCLUDED)
     file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${CPACK_ADDGRP_STR}")
-  endif(CPack_CMake_INCLUDED)
-endmacro(cpack_add_component_group)
+  endif()
+endmacro()
 
 # Macro that adds an installation type to the CPack installer
 macro(cpack_add_install_type insttype)
@@ -472,8 +472,8 @@ macro(cpack_add_install_type insttype)
   # will be encoded by cpack_encode_variables.
   if(CPack_CMake_INCLUDED)
     file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${CPACK_INSTTYPE_STR}")
-  endif(CPack_CMake_INCLUDED)
-endmacro(cpack_add_install_type)
+  endif()
+endmacro()
 
 macro(cpack_configure_downloads site)
   cpack_parse_arguments(CPACK_DOWNLOAD
@@ -497,7 +497,7 @@ macro(cpack_configure_downloads site)
     CPACK_CONFIG_DL_STR)
   if (${CPACK_DOWNLOAD_ALL} AND NOT ${CPACK_DOWNLOAD_NO_ADD_REMOVE})
     set(CPACK_DOWNLOAD_ADD_REMOVE ON)
-  endif (${CPACK_DOWNLOAD_ALL} AND NOT ${CPACK_DOWNLOAD_NO_ADD_REMOVE})
+  endif ()
   set(CPACK_ADD_REMOVE ${CPACK_DOWNLOAD_ADD_REMOVE})
   cpack_append_option_set_command(
     CPACK_ADD_REMOVE
@@ -508,6 +508,6 @@ macro(cpack_configure_downloads site)
   # will be encoded by cpack_encode_variables.
   if(CPack_CMake_INCLUDED)
     file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${CPACK_CONFIG_DL_STR}")
-  endif(CPack_CMake_INCLUDED)
-endmacro(cpack_configure_downloads)
-endif(NOT CPackComponent_CMake_INCLUDED)
+  endif()
+endmacro()
+endif()