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.

NOTE: MUST USE GNU compliant version of sed
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' \
   | xargs -0 gsed -i -f convert.sed \
&& rm convert.sed

Author: hjmjohnson

BLAS/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_subdirectory(SRC)
 if(BUILD_TESTING)
 add_subdirectory(TESTING)
-endif(BUILD_TESTING)
+endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc

BLAS/TESTING/CMakeLists.txt

@@ -43,7 +43,7 @@ macro(add_blas_test name src)
         -DINTDIR=${CMAKE_CFG_INTDIR}
         -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
     endif()
-endmacro(add_blas_test)
+endmacro()
 
 if(BUILD_SINGLE)
   add_blas_test(xblat1s sblat1.f)

CBLAS/CMakeLists.txt

@@ -34,11 +34,11 @@ install( FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h DE
 if(BUILD_TESTING)
    add_subdirectory(testing)
    add_subdirectory(examples)
-endif(BUILD_TESTING)
+endif()
 
 if(NOT BLAS_FOUND)
   set(ALL_TARGETS ${ALL_TARGETS} blas)
-endif(NOT BLAS_FOUND)
+endif()
 
 # Export cblas targets from the
 # install tree, if any.

CBLAS/src/CMakeLists.txt

@@ -146,22 +146,22 @@ set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND}
 # Single real precision
 if(CBLAS_SINGLE)
  set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND})
-endif(CBLAS_SINGLE)
+endif()
 
 # Double real precision
 if(CBLAS_DOUBLE)
  set(ALLOBJ  ${DLEV1} ${DLEV2} ${DLEV3} ${ERRHAND})
-endif(CBLAS_DOUBLE)
+endif()
 
 # Single complex precision
 if (CBLAS_COMPLEX)
  set(ALLOBJ  ${CLEV1} ${SCLEV1} ${CLEV2} ${CLEV3} ${ERRHAND})
-endif(CBLAS_COMPLEX)
+endif()
 
 # Double complex precision
 if (CBLAS_COMPLEX16)
  set(ALLOBJ  ${ZLEV1} ${ZLEV2} ${ZLEV3} ${ERRHAND})
-endif(CBLAS_COMPLEX16)
+endif()
 
 add_library(cblas ${ALLOBJ})
 target_link_libraries(cblas ${BLAS_LIBRARIES} )

CBLAS/testing/CMakeLists.txt

@@ -22,7 +22,7 @@ macro(add_cblas_test output input target)
         -DINTDIR=${CMAKE_CFG_INTDIR}
         -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
     endif()
-endmacro(add_cblas_test)
+endmacro()
 
 
 # Object files for single real precision

CMAKE/CheckTimeFunction.cmake

@@ -18,11 +18,11 @@ macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE)
       message(STATUS "Looking for Fortran ${FUNCTION} - found")
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
         "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n")
-    else(RES)
+    else()
       message(STATUS "Looking for Fortran ${FUNCTION} - not found")
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
         "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n")
-    endif(RES)
-endmacro(CHECK_TIME_FUNCTION)
+    endif()
+endmacro()
 
 

CMAKE/FortranMangling.cmake

@@ -23,7 +23,7 @@ message(STATUS "=========")
       "Fortran compiler option for setting object file name.")
     set(F77_OUTPUT_EXE "/Fe" CACHE INTERNAL
       "Fortran compiler option for setting executable file name.")
-  else(${F77} STREQUAL "ifort.exe")
+  else()
     # in other case, let user specify their fortran configrations.
     set(F77_OPTION_COMPILE "-c" CACHE STRING
       "Fortran compiler option for compiling without linking.")
@@ -35,7 +35,7 @@ message(STATUS "=========")
       "Library path for the fortran compiler")
     set(F77_INCLUDE_PATH "" CACHE PATH
       "Include path for the fortran compiler")
-  endif(${F77} STREQUAL "ifort.exe")
+  endif()
 
 
 message(STATUS "Testing FORTRAN_MANGLING")
@@ -102,4 +102,4 @@ message(STATUS "Running ./xintface...")
           message(FATAL_ERROR "FORTRAN_MANGLING:ERROR ${xintface_ERR}")
       endif()
 
-endmacro(FORTRAN_MANGLING)
+endmacro()

CMakeLists.txt

@@ -157,17 +157,17 @@ if(BLAS_LIBRARIES)
   unset( CMAKE_REQUIRED_LIBRARIES )
   if(BLAS_FOUND)
     message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
-  else(BLAS_FOUND)
+  else()
     message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
     message(ERROR "-->     Will use REFERENCE BLAS (by default)")
     message(ERROR "-->     Or Correct your BLAS_LIBRARIES entry ")
     message(ERROR "-->     Or Consider checking USE_OPTIMIZED_BLAS")
-  endif(BLAS_FOUND)
+  endif()
 
 # User did not provide a BLAS Library but specified to search for one
 elseif( USE_OPTIMIZED_BLAS )
   find_package( BLAS )
-endif (BLAS_LIBRARIES)
+endif ()
 
 # Neither user specified or optimized BLAS libraries can be used
 if(NOT BLAS_FOUND)
@@ -184,7 +184,7 @@ else()
   set( CMAKE_SHARED_LINKER_FLAGS
     "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
     CACHE STRING "Linker flags for shared libs" FORCE)
-endif( NOT BLAS_FOUND )
+endif()
 
 
 # --------------------------------------------------
@@ -193,15 +193,15 @@ option(CBLAS "Build CBLAS" OFF)
 
 if(CBLAS)
   add_subdirectory(CBLAS)
-endif(CBLAS)
+endif()
 
 # --------------------------------------------------
 # XBLAS
 
 option(USE_XBLAS "Build extended precision (needs XBLAS)" OFF)
 if (USE_XBLAS)
   find_library(XBLAS_LIBRARY NAMES xblas)
-endif(USE_XBLAS)
+endif()
 
 option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
 
@@ -210,7 +210,7 @@ option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library i
 # User did not provide a LAPACK Library but specified to search for one
 if( USE_OPTIMIZED_LAPACK )
   find_package( LAPACK )
-endif (USE_OPTIMIZED_LAPACK)
+endif ()
 
 # Check the usage of the user provided or automatically found LAPACK libraries
 if(LAPACK_LIBRARIES)
@@ -221,13 +221,13 @@ if(LAPACK_LIBRARIES)
   unset( CMAKE_REQUIRED_LIBRARIES )
   if(LATESTLAPACK_FOUND)
     message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
-  else(LAPACK_FOUND)
+  else()
     message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, 	CANNOT USE ${LAPACK_LIBRARIES}.")
     message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
     message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
     message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
-  endif(LATESTLAPACK_FOUND)
-endif (LAPACK_LIBRARIES)
+  endif()
+endif ()
 
 # Neither user specified or optimized LAPACK libraries can be used
 if(NOT LATESTLAPACK_FOUND)
@@ -248,12 +248,12 @@ else()
   set( CMAKE_SHARED_LINKER_FLAGS
     "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}"
     CACHE STRING "Linker flags for shared libs" FORCE)
-endif( NOT LATESTLAPACK_FOUND )
+endif()
 
 message(STATUS "BUILD TESTING : ${BUILD_TESTING}" )
 if(BUILD_TESTING)
   add_subdirectory(TESTING)
-endif(BUILD_TESTING)
+endif()
 
 # deprecated LAPACK routines
 option(BUILD_DEPRECATED "Build deprecated routines" OFF)
@@ -269,12 +269,12 @@ if (LAPACKE_WITH_TMG)
   set(LAPACKE ON)
   if(NOT BUILD_TESTING)
      add_subdirectory(TESTING/MATGEN)
-   endif(NOT BUILD_TESTING)
-endif(LAPACKE_WITH_TMG)
+   endif()
+endif()
 
 if(LAPACKE)
   add_subdirectory(LAPACKE)
-endif(LAPACKE)
+endif()
 
 # --------------------------------------------------
 # CPACK Packaging
@@ -296,12 +296,12 @@ if(WIN32 AND NOT UNIX)
   set(CPACK_NSIS_MODIFY_PATH ON)
   set(CPACK_NSIS_DISPLAY_NAME "LAPACK-${LAPACK_VERSION}")
   set(CPACK_PACKAGE_RELOCATABLE "true")
-else(WIN32 AND NOT UNIX)
+else()
   set(CPACK_GENERATOR "TGZ")
   set(CPACK_SOURCE_GENERATOR TGZ)
   set(CPACK_SOURCE_PACKAGE_FILE_NAME "lapack-${LAPACK_VERSION}" )
   set(CPACK_SOURCE_IGNORE_FILES ~$ .svn ${CPACK_SOURCE_IGNORE_FILES} )
-endif(WIN32 AND NOT UNIX)
+endif()
 include(CPack)
 
 
@@ -313,15 +313,15 @@ option(BUILD_STATIC_LIBS "Build static libraries" ON )
 
 if(NOT BLAS_FOUND)
   set(ALL_TARGETS ${ALL_TARGETS} blas)
-endif(NOT BLAS_FOUND)
+endif()
 
 if(NOT LATESTLAPACK_FOUND)
   set(ALL_TARGETS ${ALL_TARGETS} lapack)
-endif(NOT LATESTLAPACK_FOUND)
+endif()
 
 if(BUILD_TESTING OR LAPACKE_WITH_TMG)
   set(ALL_TARGETS ${ALL_TARGETS} tmglib)
-endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
+endif()
 
 # Export lapack targets, not including lapacke, from the
 # install tree, if any.
@@ -338,12 +338,12 @@ endif()
 # Include cblas in targets exported from the build tree.
 if(CBLAS)
   set(ALL_TARGETS ${ALL_TARGETS} cblas)
-endif(CBLAS)
+endif()
 
 # Include lapacke in targets exported from the build tree.
 if(LAPACKE)
   set(ALL_TARGETS ${ALL_TARGETS} lapacke)
-endif(LAPACKE)
+endif()
 
 # Export lapack and lapacke targets from the build tree, if any.
 set(_lapack_config_build_guard_target "")

LAPACKE/CMakeLists.txt

@@ -19,7 +19,7 @@ endif ()
 if (WIN32 AND NOT UNIX)
  add_definitions(-DHAVE_LAPACK_CONFIG_H -DLAPACK_COMPLEX_STRUCTURE)
  message (STATUS "Windows BUILD")
-endif (WIN32 AND NOT UNIX)
+endif ()
 
 get_directory_property( DirDefs COMPILE_DEFINITIONS )
 
@@ -44,22 +44,22 @@ append_subdir_files(UTILS_OBJ "utils")
 if (USE_XBLAS)
    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
    target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
-else (USE_XBLAS)
+else ()
   if (LAPACKE_WITH_TMG)
    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
    target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-  else (LAPACKE_WITH_TMG)
+  else ()
    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
    target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-  endif(LAPACKE_WITH_TMG)
-endif(USE_XBLAS)
+  endif()
+endif()
 
 lapack_install_library(lapacke)
 install( FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION include )
 
 if(BUILD_TESTING)
    add_subdirectory(example)
-endif(BUILD_TESTING)
+endif()
 
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)

TESTING/CMakeLists.txt

@@ -20,7 +20,7 @@ macro(add_lapack_test output input target)
       -DINTDIR=${CMAKE_CFG_INTDIR}
       -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
   endif()
-endmacro(add_lapack_test)
+endmacro()
 
 if (BUILD_SINGLE)
 add_lapack_test(stest.out stest.in xlintsts)