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

4 files changed, 37 insertions, 37 deletions

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 106e78f..e79689b 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -14,9 +14,9 @@ include(CheckIncludeFile)
 CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H)
 if(HAVE_ELF_H)
   set(CMAKE_USE_ELF_PARSER 1)
-else(HAVE_ELF_H)
+else()
   set(CMAKE_USE_ELF_PARSER)
-endif(HAVE_ELF_H)
+endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
 
@@ -65,7 +65,7 @@ if(CMAKE_REGENERATE_YACCLEX)
     set(BISON_FLAGS)
     if(YACC_EXECUTABLE MATCHES "bison")
       set(BISON_FLAGS "--yacc")
-    endif(YACC_EXECUTABLE MATCHES "bison")
+    endif()
     set(yacc_files)
     foreach(name ${parsersLexers})
       set(src "${CMAKE_CURRENT_SOURCE_DIR}/${name}Parser.y")
@@ -79,9 +79,9 @@ if(CMAKE_REGENERATE_YACCLEX)
         --name-prefix=${name}_yy --defines=${hdr} -o${dst} ${src}
         )
       set(yacc_files ${yacc_files} "${dst}")
-    endforeach(name)
+    endforeach()
     add_custom_target(RerunYacc DEPENDS ${yacc_files})
-  endif(YACC_EXECUTABLE)
+  endif()
   if(FLEX_EXECUTABLE)
     set(lex_files)
     foreach(name ${parsersLexers})
@@ -96,16 +96,16 @@ if(CMAKE_REGENERATE_YACCLEX)
         --prefix=${name}_yy --header-file=${hdr} -o${dst} ${src}
         )
       set(lex_files ${lex_files} "${dst}")
-    endforeach(name)
+    endforeach()
     add_custom_target(RerunLex DEPENDS ${lex_files})
-  endif(FLEX_EXECUTABLE)
+  endif()
 
-endif(CMAKE_REGENERATE_YACCLEX)
+endif()
 
 # Check if we can build the ELF parser.
 if(CMAKE_USE_ELF_PARSER)
   set(ELF_SRCS cmELF.h cmELF.cxx)
-endif(CMAKE_USE_ELF_PARSER)
+endif()
 
 #
 # Sources for CMakeLib
@@ -277,7 +277,7 @@ set(SRCS
 # Kdevelop only works on UNIX and not windows
 if(UNIX)
   set(SRCS ${SRCS} cmGlobalKdevelopGenerator.cxx)
-endif(UNIX)
+endif()
 
 # Xcode only works on Apple
 if(APPLE)
@@ -288,7 +288,7 @@ if(APPLE)
     cmGlobalXCodeGenerator.h
     cmLocalXCodeGenerator.cxx
     cmLocalXCodeGenerator.h)
-endif(APPLE)
+endif()
 
 
 if (WIN32)
@@ -356,8 +356,8 @@ if (WIN32)
       cmWin32ProcessExecution.cxx
       cmWin32ProcessExecution.h
       )
-  endif(NOT UNIX)
-endif (WIN32)
+  endif()
+endif ()
 
 # Ninja support
 set(SRCS ${SRCS}
@@ -390,12 +390,12 @@ target_link_libraries(CMakeLib cmsys
 # On Apple we need CoreFoundation
 if(APPLE)
   target_link_libraries(CMakeLib "-framework CoreFoundation")
-endif(APPLE)
+endif()
 
 # On some platforms we need the rpcrt4 library for the VS 7 generators.
 if(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
   target_link_libraries(CMakeLib rpcrt4)
-endif(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
+endif()
 
 #
 # CTestLib
@@ -488,14 +488,14 @@ if(CYGWIN)
     CPack/cmCPackCygwinBinaryGenerator.cxx
     CPack/cmCPackCygwinSourceGenerator.cxx
     )
-endif(CYGWIN)
+endif()
 
 if(UNIX)
   set(CPACK_SRCS ${CPACK_SRCS}
     CPack/cmCPackDebGenerator.cxx
     CPack/cmCPackRPMGenerator.cxx
     )
-endif(UNIX)
+endif()
 
 if(APPLE)
   set(CPACK_SRCS ${CPACK_SRCS}
@@ -504,7 +504,7 @@ if(APPLE)
     CPack/cmCPackOSXX11Generator.cxx
     CPack/cmCPackPackageMakerGenerator.cxx
     )
-endif(APPLE)
+endif()
 
 # Build CPackLib
 add_library(CPackLib ${CPACK_SRCS})
@@ -517,7 +517,7 @@ if(APPLE)
     CPack/OSXScriptLauncher.cxx)
   target_link_libraries(OSXScriptLauncher cmsys)
   target_link_libraries(OSXScriptLauncher "-framework CoreFoundation")
-endif(APPLE)
+endif()
 
 # Build CMake executable
 add_executable(cmake cmakemain.cxx)
@@ -529,8 +529,8 @@ if(WIN32)
     add_executable(cmw9xcom cmw9xcom.cxx)
     target_link_libraries(cmw9xcom CMakeLib)
     install_targets(/bin cmw9xcom)
-  endif(NOT UNIX)
-endif(WIN32)
+  endif()
+endif()
 
 # Build CTest executable
 add_executable(ctest ctest.cxx)
@@ -543,13 +543,13 @@ target_link_libraries(cpack CPackLib)
 # Curses GUI
 if(BUILD_CursesDialog)
   include(${CMake_SOURCE_DIR}/Source/CursesDialog/CMakeLists.txt)
-endif(BUILD_CursesDialog)
+endif()
 
 # Qt GUI
 option(BUILD_QtDialog "Build Qt dialog for CMake" FALSE)
 if(BUILD_QtDialog)
   subdirs(QtDialog)
-endif(BUILD_QtDialog)
+endif()
 
 include (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
 include (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
@@ -559,6 +559,6 @@ install_targets(/bin ctest)
 install_targets(/bin cpack)
 if(APPLE)
   install_targets(/bin cmakexbuild)
-endif(APPLE)
+endif()
 
 install_files(${CMAKE_DATA_DIR}/include cmCPluginAPI.h)
diff --git a/Source/CursesDialog/form/CMakeLists.txt b/Source/CursesDialog/form/CMakeLists.txt
index d5cc1bd..4e07fa0 100644
--- a/Source/CursesDialog/form/CMakeLists.txt
+++ b/Source/CursesDialog/form/CMakeLists.txt
@@ -63,4 +63,4 @@ add_library(cmForm ${FORM_SRCS} )
 target_link_libraries(cmForm ${CURSES_LIBRARY})
 if(CURSES_EXTRA_LIBRARY)
   target_link_libraries(cmForm ${CURSES_EXTRA_LIBRARY})
-endif(CURSES_EXTRA_LIBRARY)
+endif()
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index d962d8d..0969aea 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -15,7 +15,7 @@ find_package(Qt4 REQUIRED)
 
 if(NOT QT4_FOUND)
   message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
-else(NOT QT4_FOUND)
+else()
 
   include(${QT_USE_FILE})
   set(CMAKE_PACKAGE_QTGUI TRUE)
@@ -58,13 +58,13 @@ else(NOT QT4_FOUND)
   set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
   if(Q_WS_WIN)
     set(SRCS ${SRCS} CMakeSetup.rc)
-  endif(Q_WS_WIN)
+  endif()
   if(Q_WS_MAC)
     set(SRCS ${SRCS} CMakeSetup.icns)
     set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
     set_source_files_properties(CMakeSetup.icns PROPERTIES
       MACOSX_PACKAGE_LOCATION Resources)
-  endif(Q_WS_MAC)
+  endif()
 
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
   include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@@ -75,10 +75,10 @@ else(NOT QT4_FOUND)
     if(APPLE)
       set_target_properties(cmake-gui PROPERTIES
        OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
-    endif(APPLE)
+    endif()
     set(CMAKE_INSTALL_DESTINATION_ARGS
       BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
-  endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+  endif()
 
   install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
 
@@ -88,7 +88,7 @@ else(NOT QT4_FOUND)
     install(FILES CMake.desktop DESTINATION share/applications )
     install(FILES CMakeSetup32.png DESTINATION share/pixmaps )
     install(FILES cmakecache.xml DESTINATION share/mime/packages )
-  endif(UNIX)
+  endif()
 
   if(APPLE)
     set(CMAKE_POSTFLIGHT_SCRIPT
@@ -101,7 +101,7 @@ else(NOT QT4_FOUND)
       "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
     install(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui
                   WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
-  endif(APPLE)
+  endif()
 
   if(APPLE OR WIN32)
     # install rules for including 3rd party libs such as Qt
@@ -109,15 +109,15 @@ else(NOT QT4_FOUND)
     set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
     if(APPLE)
       set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}")
-    endif(APPLE)
+    endif()
     install(CODE "
       include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
       set(BU_CHMOD_BUNDLE_ITEMS ON)
       fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
     ")
-  endif(APPLE OR WIN32)
+  endif()
 
   configure_file("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)
-endif(NOT QT4_FOUND)
+endif()
 
diff --git a/Source/QtDialog/QtDialogCPack.cmake.in b/Source/QtDialog/QtDialogCPack.cmake.in
index f43e1c3..3196471 100644
--- a/Source/QtDialog/QtDialogCPack.cmake.in
+++ b/Source/QtDialog/QtDialogCPack.cmake.in
@@ -12,7 +12,7 @@ if(CMAKE_PACKAGE_QTGUI)
     # we also want to run post install stuff to setup command line
     set(CPACK_POSTFLIGHT_SCRIPT "@CMAKE_POSTFLIGHT_SCRIPT@")
     set(CPACK_POSTUPGRADE_SCRIPT "@CMAKE_POSTUPGRADE_SCRIPT@")
-  endif(IS_APPLE)
-endif(CMAKE_PACKAGE_QTGUI)
+  endif()
+endif()