STYLE: 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.
2026-04-10 11:34:33 +08:00 · 2019-10-31 11:36:27 -05:00
parent f1e8307308
commit 6fb3e5f176
59 changed files with 253 additions and 253 deletions
--- a/cmake/EigenConfigureTesting.cmake
+++ b/cmake/EigenConfigureTesting.cmake
@@ -49,10 +49,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    set(COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage")
    set(CTEST_CUSTOM_COVERAGE_EXCLUDE "/test/")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS}")
-  endif(EIGEN_COVERAGE_TESTING)
+  endif()
  
 elseif(MSVC)
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS")
-endif(CMAKE_COMPILER_IS_GNUCXX)
+endif()


--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -6,7 +6,7 @@ macro(ei_add_property prop value)
  else()
    set_property(GLOBAL PROPERTY ${prop} "${previous} ${value}")
  endif()
-endmacro(ei_add_property)
+endmacro()

 #internal. See documentation of ei_add_test for details.
 macro(ei_add_test_internal testname testname_with_suffix)
@@ -60,11 +60,11 @@ macro(ei_add_test_internal testname testname_with_suffix)

  if(EIGEN_NO_ASSERTION_CHECKING)
    ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1")
-  else(EIGEN_NO_ASSERTION_CHECKING)
+  else()
    if(EIGEN_DEBUG_ASSERTS)
      ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_DEBUG_ASSERTS=1")
-    endif(EIGEN_DEBUG_ASSERTS)
-  endif(EIGEN_NO_ASSERTION_CHECKING)
+    endif()
+  endif()

  ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_MAX_SIZE=${EIGEN_TEST_MAX_SIZE}")

@@ -75,7 +75,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
  # let the user pass flags.
  if(${ARGC} GREATER 2)
    ei_add_target_property(${targetname} COMPILE_FLAGS "${ARGV2}")
-  endif(${ARGC} GREATER 2)
+  endif()

  if(EIGEN_TEST_CUSTOM_CXX_FLAGS)
    ei_add_target_property(${targetname} COMPILE_FLAGS "${EIGEN_TEST_CUSTOM_CXX_FLAGS}")
@@ -114,7 +114,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
    set_property(TEST ${testname_with_suffix} PROPERTY LABELS "${current_subproject}")
  endif()

-endmacro(ei_add_test_internal)
+endmacro()

 # SYCL
 macro(ei_add_test_internal_sycl testname testname_with_suffix)
@@ -160,11 +160,11 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)

  if(EIGEN_NO_ASSERTION_CHECKING)
    ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1")
-  else(EIGEN_NO_ASSERTION_CHECKING)
+  else()
    if(EIGEN_DEBUG_ASSERTS)
      ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_DEBUG_ASSERTS=1")
-    endif(EIGEN_DEBUG_ASSERTS)
-  endif(EIGEN_NO_ASSERTION_CHECKING)
+    endif()
+  endif()

  ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_MAX_SIZE=${EIGEN_TEST_MAX_SIZE}")

@@ -175,7 +175,7 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
  # let the user pass flags.
  if(${ARGC} GREATER 2)
    ei_add_target_property(${targetname} COMPILE_FLAGS "${ARGV2}")
-  endif(${ARGC} GREATER 2)
+  endif()

  if(EIGEN_TEST_CUSTOM_CXX_FLAGS)
    ei_add_target_property(${targetname} COMPILE_FLAGS "${EIGEN_TEST_CUSTOM_CXX_FLAGS}")
@@ -215,7 +215,7 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
  endif()


-endmacro(ei_add_test_internal_sycl)
+endmacro()


 # Macro to add a test
@@ -290,11 +290,11 @@ macro(ei_add_test testname)
      ei_add_test_internal(${testname} ${testname}_${suffix}
        "${ARGV1} -DEIGEN_TEST_PART_${suffix}=1" "${ARGV2}")
      add_dependencies(${testname} ${testname}_${suffix})
-    endforeach(suffix)
+    endforeach()
  else()
    ei_add_test_internal(${testname} ${testname} "${ARGV1} -DEIGEN_TEST_PART_ALL=1" "${ARGV2}")
  endif()
-endmacro(ei_add_test)
+endmacro()

 macro(ei_add_test_sycl testname)
  get_property(EIGEN_TESTS_LIST GLOBAL PROPERTY EIGEN_TESTS_LIST)
@@ -319,16 +319,16 @@ macro(ei_add_test_sycl testname)
      ei_add_test_internal_sycl(${testname} ${testname}_${suffix}
        "${ARGV1} -DEIGEN_TEST_PART_${suffix}=1" "${ARGV2}")
      add_dependencies(${testname} ${testname}_${suffix})
-    endforeach(suffix)
-  else(EIGEN_SPLIT_LARGE_TESTS AND suffixes)
+    endforeach()
+  else()
    set(symbols_to_enable_all_parts "")
    foreach(suffix ${suffixes})
      set(symbols_to_enable_all_parts
        "${symbols_to_enable_all_parts} -DEIGEN_TEST_PART_${suffix}=1")
-    endforeach(suffix)
+    endforeach()
    ei_add_test_internal_sycl(${testname} ${testname} "${ARGV1} ${symbols_to_enable_all_parts}" "${ARGV2}")
-  endif(EIGEN_SPLIT_LARGE_TESTS AND suffixes)
-endmacro(ei_add_test_sycl)
+  endif()
+endmacro()

 # adds a failtest, i.e. a test that succeed if the program fails to compile
 # note that the test runner for these is CMake itself, when passed -DEIGEN_FAILTEST=ON
@@ -360,7 +360,7 @@ macro(ei_add_failtest testname)

  # Expect the second test to fail
  set_tests_properties(${test_target_ko} PROPERTIES WILL_FAIL TRUE)
-endmacro(ei_add_failtest)
+endmacro()

 # print a summary of the different options
 macro(ei_testing_print_summary)
@@ -510,7 +510,7 @@ macro(ei_testing_print_summary)
  message(STATUS "\n${EIGEN_TESTING_SUMMARY}")

  message(STATUS "************************************************************")
-endmacro(ei_testing_print_summary)
+endmacro()

 macro(ei_init_testing)
  define_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT BRIEF_DOCS " " FULL_DOCS " ")
@@ -532,7 +532,7 @@ macro(ei_init_testing)

  # uncomment anytime you change the ei_get_compilerver_from_cxx_version_string macro
  # ei_test_get_compilerver_from_cxx_version_string()
-endmacro(ei_init_testing)
+endmacro()

 macro(ei_set_sitename)
  # if the sitename is not yet set, try to set it
@@ -549,7 +549,7 @@ macro(ei_set_sitename)
  if(SITE)
    string(TOLOWER ${SITE} SITE)
  endif()
-endmacro(ei_set_sitename)
+endmacro()

 macro(ei_get_compilerver VAR)
    if(MSVC)
@@ -582,7 +582,7 @@ macro(ei_get_compilerver VAR)
    set(${VAR} "${CNAME}-${CVER}")

  endif()
-endmacro(ei_get_compilerver)
+endmacro()

 # Extract compiler name and version from a raw version string
 # WARNING: if you edit thid macro, then please test it by  uncommenting
@@ -631,7 +631,7 @@ macro(ei_get_compilerver_from_cxx_version_string VERSTRING CNAME CVER)

  string(REGEX REPLACE ".(.*)" "\\1" ${CVER} ${eicver})

-endmacro(ei_get_compilerver_from_cxx_version_string)
+endmacro()

 macro(ei_get_cxxflags VAR)
  set(${VAR} "")
@@ -679,7 +679,7 @@ macro(ei_get_cxxflags VAR)
      set(${VAR} ${${VAR}}-ROWMAJ)
    endif()
  endif()
-endmacro(ei_get_cxxflags)
+endmacro()

 macro(ei_set_build_string)
  ei_get_compilerver(LOCAL_COMPILER_VERSION)
@@ -714,7 +714,7 @@ macro(ei_set_build_string)
  endif()

  string(TOLOWER ${TMP_BUILD_STRING} BUILDNAME)
-endmacro(ei_set_build_string)
+endmacro()

 macro(ei_is_64bit_env VAR)
  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -724,7 +724,7 @@ macro(ei_is_64bit_env VAR)
  else()
    message(WARNING "Unsupported pointer size. Please contact the authors.")
  endif()
-endmacro(ei_is_64bit_env)
+endmacro()


 # helper macro for testing ei_get_compilerver_from_cxx_version_string
@@ -737,7 +737,7 @@ macro(ei_test1_get_compilerver_from_cxx_version_string STR REFNAME REFVER)
    message("STATUS ei_get_compilerver_from_cxx_version_string error:")
    message("Expected \"${REFNAME}-${REFVER}\", got \"${CNAME}-${CVER}\"")
  endif()
-endmacro(ei_test1_get_compilerver_from_cxx_version_string)
+endmacro()

 # macro for testing ei_get_compilerver_from_cxx_version_string
 # feel free to add more version strings
@@ -752,4 +752,4 @@ macro(ei_test_get_compilerver_from_cxx_version_string)
  ei_test1_get_compilerver_from_cxx_version_string("i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)" "llvm-g++" "4.2.1")
  ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 4.4.6" "g++" "4.4.6")
  ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 2011" "g++" "4.4")
-endmacro(ei_test_get_compilerver_from_cxx_version_string)
+endmacro()
--- a/cmake/EigenUninstall.cmake
+++ b/cmake/EigenUninstall.cmake
@@ -27,7 +27,7 @@ if(EXISTS ${MANIFEST})
    else()
      message(STATUS "File '${file}' does not exist.")
    endif()
-  endforeach(file)
+  endforeach()

  message(STATUS "========== Finished Uninstalling Eigen  ==============")
 else()
--- a/cmake/FindAdolc.cmake
+++ b/cmake/FindAdolc.cmake
@@ -1,7 +1,7 @@

 if (ADOLC_INCLUDES AND ADOLC_LIBRARIES)
  set(ADOLC_FIND_QUIETLY TRUE)
-endif (ADOLC_INCLUDES AND ADOLC_LIBRARIES)
+endif ()

 find_path(ADOLC_INCLUDES
  NAMES
--- a/cmake/FindBLAS.cmake
+++ b/cmake/FindBLAS.cmake
@@ -270,8 +270,8 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)
      endif ()
      set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
      set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
-    endif(_libraries_work)
-  endforeach(_library ${_list})
+    endif()
+  endforeach()

  if(_libraries_work)
    # Test this combination of libraries.
@@ -310,11 +310,11 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)

  if(_libraries_work)
    set(${LIBRARIES} ${${LIBRARIES}} ${_thread})
-  else(_libraries_work)
+  else()
    set(${LIBRARIES} FALSE)
-  endif(_libraries_work)
+  endif()

-endmacro(Check_Fortran_Libraries)
+endmacro()


 set(BLAS_LINKER_FLAGS)
@@ -438,7 +438,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
      if (OMP_gomp_LIBRARY)
 	set(OMP_LIB "${OMP_gomp_LIBRARY}")
      endif()
-    else(CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    else()
      if (OMP_iomp5_LIBRARY)
 	set(OMP_LIB "${OMP_iomp5_LIBRARY}")
      endif()
@@ -560,7 +560,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
 		"${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}")
 	    endforeach()
 	  endforeach()
-	else (WIN32)
+	else ()
 	  if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
 	    list(APPEND BLAS_SEARCH_LIBS
 	      "mkl_blas95 mkl_intel mkl_intel_thread mkl_core guide")
@@ -586,9 +586,9 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
 	      set(OMP_LIB "")
 	    endif()
 	  endif ()
-	endif (WIN32)
+	endif ()

-      else (BLA_F95)
+      else ()

 	set(BLAS_mkl_SEARCH_SYMBOL sgemm)
 	set(_LIBRARIES BLAS_LIBRARIES)
@@ -632,7 +632,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
 		"${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}")
 	    endforeach()
 	  endforeach()
-	else (WIN32)
+	else ()
 	  if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
 	    list(APPEND BLAS_SEARCH_LIBS
 	      "mkl_intel mkl_intel_thread mkl_core guide")
@@ -667,9 +667,9 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
 	    list(APPEND BLAS_SEARCH_LIBS
 	      "mkl_em64t")
 	  endif ()
-	endif (WIN32)
+	endif ()

-      endif (BLA_F95)
+      endif ()

      foreach (IT ${BLAS_SEARCH_LIBS})
 	string(REPLACE " " ";" SEARCH_LIBS ${IT})
@@ -698,9 +698,9 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
      if (${_LIBRARIES} AND NOT BLAS_VENDOR_FOUND)
          set (BLAS_VENDOR_FOUND "Intel MKL")
      endif()
-    endif (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
-  endif(NOT BLAS_LIBRARIES OR BLA_VENDOR MATCHES "Intel*")
-endif (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
+    endif ()
+  endif()
+endif ()


 if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
@@ -727,7 +727,7 @@ if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "Goto")
  endif()

-endif (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
+endif ()


 # OpenBlas
@@ -755,7 +755,7 @@ if (BLA_VENDOR STREQUAL "Open" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "Openblas")
  endif()

-endif (BLA_VENDOR STREQUAL "Open" OR BLA_VENDOR STREQUAL "All")
+endif ()


 # EigenBlas
@@ -802,7 +802,7 @@ if (BLA_VENDOR STREQUAL "Eigen" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "Eigen")
  endif()

-endif (BLA_VENDOR STREQUAL "Eigen" OR BLA_VENDOR STREQUAL "All")
+endif ()


 if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
@@ -830,7 +830,7 @@ if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "Atlas")
  endif()

-endif (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
+endif ()


 # BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
@@ -858,7 +858,7 @@ if (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "PhiPACK")
  endif()

-endif (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")
+endif ()


 # BLAS in Alpha CXML library?
@@ -886,7 +886,7 @@ if (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "CXML")
  endif()

-endif (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
+endif ()


 # BLAS in Alpha DXML library? (now called CXML, see above)
@@ -914,7 +914,7 @@ if (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "DXML")
  endif()
  
-endif (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
+endif ()


 # BLAS in Sun Performance library?
@@ -1124,7 +1124,7 @@ if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
 	  "${_ACML_ROOT}/${_ACML_COMPILER64}${_ACML_PATH_SUFFIX}/lib" )
      endif()

-    endif(_ACML_ROOT)
+    endif()

  elseif(BLAS_${BLA_VENDOR}_LIB_DIRS)

@@ -1229,7 +1229,7 @@ if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "ACML")
  endif()

-endif (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All") # ACML
+endif () # ACML


 # Apple BLAS library?
@@ -1257,7 +1257,7 @@ if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "Apple Accelerate")
  endif()

-endif (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
+endif ()


 if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
@@ -1284,7 +1284,7 @@ if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "NAS")
  endif()

-endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
+endif ()


 # Generic BLAS library?
@@ -1316,7 +1316,7 @@ if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
      set (BLAS_VENDOR_FOUND "Netlib or other Generic libblas")
  endif()

-endif (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
+endif ()


 if(BLA_F95)
@@ -1331,7 +1331,7 @@ if(BLA_F95)
    if(BLAS95_FOUND)
      message(STATUS "A library with BLAS95 API found.")
      message(STATUS "BLAS_LIBRARIES ${BLAS_LIBRARIES}")
-    else(BLAS95_FOUND)
+    else()
      message(WARNING "BLA_VENDOR has been set to ${BLA_VENDOR} but blas 95 libraries could not be found or check of symbols failed."
 	"\nPlease indicate where to find blas libraries. You have three options:\n"
 	"- Option 1: Provide the installation directory of BLAS library with cmake option: -DBLAS_DIR=your/path/to/blas\n"
@@ -1349,13 +1349,13 @@ if(BLA_F95)
 	message(STATUS
 	  "A library with BLAS95 API not found. Please specify library location.")
      endif()
-    endif(BLAS95_FOUND)
-  endif(NOT BLAS_FIND_QUIETLY)
+    endif()
+  endif()

  set(BLAS_FOUND TRUE)
  set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}")

-else(BLA_F95)
+else()

  if(BLAS_LIBRARIES)
    set(BLAS_FOUND TRUE)
@@ -1367,7 +1367,7 @@ else(BLA_F95)
    if(BLAS_FOUND)
      message(STATUS "A library with BLAS API found.")
      message(STATUS "BLAS_LIBRARIES ${BLAS_LIBRARIES}")
-    else(BLAS_FOUND)
+    else()
      message(WARNING "BLA_VENDOR has been set to ${BLA_VENDOR} but blas libraries could not be found or check of symbols failed."
 	"\nPlease indicate where to find blas libraries. You have three options:\n"
 	"- Option 1: Provide the installation directory of BLAS library with cmake option: -DBLAS_DIR=your/path/to/blas\n"
@@ -1385,10 +1385,10 @@ else(BLA_F95)
 	message(STATUS
 	  "A library with BLAS API not found. Please specify library location.")
      endif()
-    endif(BLAS_FOUND)
-  endif(NOT BLAS_FIND_QUIETLY)
+    endif()
+  endif()

-endif(BLA_F95)
+endif()

 set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})

--- a/cmake/FindCholmod.cmake
+++ b/cmake/FindCholmod.cmake
@@ -3,7 +3,7 @@

 if (CHOLMOD_INCLUDES AND CHOLMOD_LIBRARIES)
  set(CHOLMOD_FIND_QUIETLY TRUE)
-endif (CHOLMOD_INCLUDES AND CHOLMOD_LIBRARIES)
+endif ()

 find_path(CHOLMOD_INCLUDES
  NAMES
@@ -29,7 +29,7 @@ if(CHOLMOD_LIBRARIES)
    set(CHOLMOD_LIBRARIES FALSE)
  endif ()

-endif(CHOLMOD_LIBRARIES)
+endif()

 if(CHOLMOD_LIBRARIES)

@@ -40,7 +40,7 @@ if(CHOLMOD_LIBRARIES)
    set(CHOLMOD_LIBRARIES FALSE)
  endif ()

-endif(CHOLMOD_LIBRARIES)
+endif()

 if(CHOLMOD_LIBRARIES)

@@ -51,7 +51,7 @@ if(CHOLMOD_LIBRARIES)
    set(CHOLMOD_LIBRARIES FALSE)
  endif ()

-endif(CHOLMOD_LIBRARIES)
+endif()

 if(CHOLMOD_LIBRARIES)

@@ -62,7 +62,7 @@ if(CHOLMOD_LIBRARIES)
    set(CHOLMOD_LIBRARIES FALSE)
  endif ()

-endif(CHOLMOD_LIBRARIES)
+endif()

 if(CHOLMOD_LIBRARIES)

@@ -71,16 +71,16 @@ if(CHOLMOD_LIBRARIES)
    set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${CHOLMOD_METIS_LIBRARY})
  endif ()

-endif(CHOLMOD_LIBRARIES)
+endif()

 if(CHOLMOD_LIBRARIES)

  find_library(SUITESPARSE_LIBRARY SuiteSparse PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
  if (SUITESPARSE_LIBRARY)
    set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${SUITESPARSE_LIBRARY})
-  endif (SUITESPARSE_LIBRARY)
+  endif ()
  
-endif(CHOLMOD_LIBRARIES)
+endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(CHOLMOD DEFAULT_MSG
--- a/cmake/FindComputeCpp.cmake
+++ b/cmake/FindComputeCpp.cmake
@@ -263,4 +263,4 @@ function(add_sycl_to_target targetName binaryDir sourceFiles)
  target_link_libraries(${targetName} PUBLIC ${COMPUTECPP_RUNTIME_LIBRARY}
                        PUBLIC ${OpenCL_LIBRARIES})

-endfunction(add_sycl_to_target)
+endfunction()
--- a/cmake/FindEigen2.cmake
+++ b/cmake/FindEigen2.cmake
@@ -17,16 +17,16 @@
 if(NOT Eigen2_FIND_VERSION)
  if(NOT Eigen2_FIND_VERSION_MAJOR)
    set(Eigen2_FIND_VERSION_MAJOR 2)
-  endif(NOT Eigen2_FIND_VERSION_MAJOR)
+  endif()
  if(NOT Eigen2_FIND_VERSION_MINOR)
    set(Eigen2_FIND_VERSION_MINOR 0)
-  endif(NOT Eigen2_FIND_VERSION_MINOR)
+  endif()
  if(NOT Eigen2_FIND_VERSION_PATCH)
    set(Eigen2_FIND_VERSION_PATCH 0)
-  endif(NOT Eigen2_FIND_VERSION_PATCH)
+  endif()

  set(Eigen2_FIND_VERSION "${Eigen2_FIND_VERSION_MAJOR}.${Eigen2_FIND_VERSION_MINOR}.${Eigen2_FIND_VERSION_PATCH}")
-endif(NOT Eigen2_FIND_VERSION)
+endif()

 macro(_eigen2_check_version)
  file(READ "${EIGEN2_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen2_version_header)
@@ -49,8 +49,8 @@ macro(_eigen2_check_version)

    message(STATUS "Eigen2 version ${EIGEN2_VERSION} found in ${EIGEN2_INCLUDE_DIR}, "
                   "but at least version ${Eigen2_FIND_VERSION} is required")
-  endif(NOT EIGEN2_VERSION_OK)
-endmacro(_eigen2_check_version)
+  endif()
+endmacro()

 if (EIGEN2_INCLUDE_DIR)

@@ -58,7 +58,7 @@ if (EIGEN2_INCLUDE_DIR)
  _eigen2_check_version()
  set(EIGEN2_FOUND ${EIGEN2_VERSION_OK})

-else (EIGEN2_INCLUDE_DIR)
+else ()

 find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core
     PATHS
@@ -69,12 +69,12 @@ find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core

 if(EIGEN2_INCLUDE_DIR)
  _eigen2_check_version()
-endif(EIGEN2_INCLUDE_DIR)
+endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Eigen2 DEFAULT_MSG EIGEN2_INCLUDE_DIR EIGEN2_VERSION_OK)

 mark_as_advanced(EIGEN2_INCLUDE_DIR)

-endif(EIGEN2_INCLUDE_DIR)
+endif()

--- a/cmake/FindEigen3.cmake
+++ b/cmake/FindEigen3.cmake
@@ -28,16 +28,16 @@
 if(NOT Eigen3_FIND_VERSION)
  if(NOT Eigen3_FIND_VERSION_MAJOR)
    set(Eigen3_FIND_VERSION_MAJOR 2)
-  endif(NOT Eigen3_FIND_VERSION_MAJOR)
+  endif()
  if(NOT Eigen3_FIND_VERSION_MINOR)
    set(Eigen3_FIND_VERSION_MINOR 91)
-  endif(NOT Eigen3_FIND_VERSION_MINOR)
+  endif()
  if(NOT Eigen3_FIND_VERSION_PATCH)
    set(Eigen3_FIND_VERSION_PATCH 0)
-  endif(NOT Eigen3_FIND_VERSION_PATCH)
+  endif()

  set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
-endif(NOT Eigen3_FIND_VERSION)
+endif()

 macro(_eigen3_check_version)
  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
@@ -52,16 +52,16 @@ macro(_eigen3_check_version)
  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
  if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
    set(EIGEN3_VERSION_OK FALSE)
-  else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+  else()
    set(EIGEN3_VERSION_OK TRUE)
-  endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+  endif()

  if(NOT EIGEN3_VERSION_OK)

    message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
                   "but at least version ${Eigen3_FIND_VERSION} is required")
-  endif(NOT EIGEN3_VERSION_OK)
-endmacro(_eigen3_check_version)
+  endif()
+endmacro()

 if (EIGEN3_INCLUDE_DIR)

@@ -70,7 +70,7 @@ if (EIGEN3_INCLUDE_DIR)
  set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
  set(Eigen3_FOUND ${EIGEN3_VERSION_OK})

-else (EIGEN3_INCLUDE_DIR)
+else ()
  
  # search first if an Eigen3Config.cmake is available in the system,
  # if successful this would set EIGEN3_INCLUDE_DIR and the rest of
@@ -87,18 +87,18 @@ else (EIGEN3_INCLUDE_DIR)
        ${KDE4_INCLUDE_DIR}
        PATH_SUFFIXES eigen3 eigen
      )
-  endif(NOT EIGEN3_INCLUDE_DIR)
+  endif()

  if(EIGEN3_INCLUDE_DIR)
    _eigen3_check_version()
-  endif(EIGEN3_INCLUDE_DIR)
+  endif()

  include(FindPackageHandleStandardArgs)
  find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)

  mark_as_advanced(EIGEN3_INCLUDE_DIR)

-endif(EIGEN3_INCLUDE_DIR)
+endif()

 if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen)
  add_library(Eigen3::Eigen INTERFACE IMPORTED)
--- a/cmake/FindFFTW.cmake
+++ b/cmake/FindFFTW.cmake
@@ -101,7 +101,7 @@ else()
    PATHS ${PKG_FFTW_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR}
  )

-endif( FFTW_ROOT )
+endif()

 set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB})

--- a/cmake/FindGMP.cmake
+++ b/cmake/FindGMP.cmake
@@ -3,7 +3,7 @@

 if (GMP_INCLUDES AND GMP_LIBRARIES)
  set(GMP_FIND_QUIETLY TRUE)
-endif (GMP_INCLUDES AND GMP_LIBRARIES)
+endif ()

 find_path(GMP_INCLUDES
  NAMES
--- a/cmake/FindGSL.cmake
+++ b/cmake/FindGSL.cmake
@@ -54,7 +54,7 @@ IF(WIN32)
 		PATHS  ${GSL_POSSIBLE_ROOT_DIRS}
 		PATH_SUFFIXES lib
 		DOC "GSL library")
-  endif(NOT GSL_GSL_LIBRARY)
+  endif()
  
  FIND_LIBRARY(GSL_GSLCBLAS_LIBRARY
    NAMES libgslcblas.dll.a gslcblas libgslcblas
@@ -68,7 +68,7 @@ IF(WIN32)
 		PATHS  ${GSL_POSSIBLE_ROOT_DIRS}
 		PATH_SUFFIXES lib
 		DOC "GSL library")
-  endif(NOT GSL_GSLCBLAS_LIBRARY)
+  endif()
  
  SET(GSL_LIBRARIES ${GSL_GSL_LIBRARY})

--- a/cmake/FindGoogleHash.cmake
+++ b/cmake/FindGoogleHash.cmake
@@ -1,7 +1,7 @@

 if (GOOGLEHASH_INCLUDES AND GOOGLEHASH_LIBRARIES)
  set(GOOGLEHASH_FIND_QUIETLY TRUE)
-endif (GOOGLEHASH_INCLUDES AND GOOGLEHASH_LIBRARIES)
+endif ()

 find_path(GOOGLEHASH_INCLUDES
  NAMES
@@ -15,7 +15,7 @@ if(GOOGLEHASH_INCLUDES)
  file(WRITE ${CMAKE_BINARY_DIR}/googlehash_test.cpp
  "#include <google/sparse_hash_map>\n#include <google/dense_hash_map>\nint main(int argc, char** argv) { google::dense_hash_map<int,float> a; google::sparse_hash_map<int,float> b; return 0;}\n")
  try_compile(GOOGLEHASH_COMPILE ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/googlehash_test.cpp OUTPUT_VARIABLE GOOGLEHASH_COMPILE_RESULT)
-endif(GOOGLEHASH_INCLUDES)
+endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GOOGLEHASH DEFAULT_MSG GOOGLEHASH_INCLUDES GOOGLEHASH_COMPILE)
--- a/cmake/FindHWLOC.cmake
+++ b/cmake/FindHWLOC.cmake
@@ -85,7 +85,7 @@ if( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER )
    endif()
  endif()

-endif( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER )
+endif()

 if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) )

@@ -282,9 +282,9 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) O
    set(CMAKE_REQUIRED_INCLUDES)
    set(CMAKE_REQUIRED_FLAGS)
    set(CMAKE_REQUIRED_LIBRARIES)
-  endif(HWLOC_LIBRARIES)
+  endif()

-endif( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) )
+endif()

 if (HWLOC_LIBRARIES)
  if (HWLOC_LIBRARY_DIRS)
--- a/cmake/FindKLU.cmake
+++ b/cmake/FindKLU.cmake
@@ -3,7 +3,7 @@

 if (KLU_INCLUDES AND KLU_LIBRARIES)
  set(KLU_FIND_QUIETLY TRUE)
-endif (KLU_INCLUDES AND KLU_LIBRARIES)
+endif ()

 find_path(KLU_INCLUDES
  NAMES
@@ -22,7 +22,7 @@ if(KLU_LIBRARIES)

  if(NOT KLU_LIBDIR)
    get_filename_component(KLU_LIBDIR ${KLU_LIBRARIES} PATH)
-  endif(NOT KLU_LIBDIR)
+  endif()

  find_library(COLAMD_LIBRARY colamd PATHS ${KLU_LIBDIR} $ENV{KLUDIR} ${LIB_INSTALL_DIR})
  if(COLAMD_LIBRARY)
@@ -39,7 +39,7 @@ if(KLU_LIBRARIES)
    set(KLU_LIBRARIES ${KLU_LIBRARIES} ${BTF_LIBRARY})
  endif()

-endif(KLU_LIBRARIES)
+endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(KLU DEFAULT_MSG
--- a/cmake/FindLAPACK.cmake
+++ b/cmake/FindLAPACK.cmake
@@ -75,8 +75,8 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
      mark_as_advanced(${_prefix}_${_library}_LIBRARY)
      set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
      set(_libraries_found ${${_prefix}_${_library}_LIBRARY})
-    endif(_libraries_found)
-  endforeach(_library ${_list})
+    endif()
+  endforeach()
  if(_libraries_found)
    set(_libraries_found ${${LIBRARIES}})
  endif()
@@ -103,7 +103,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
    set(CMAKE_REQUIRED_LIBRARIES    "")
    mark_as_advanced(${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
    set(_libraries_work ${${_prefix}_${_name}_${_combined_name}_f2c_WORKS})
-  endif(_libraries_found AND NOT _libraries_work)
+  endif()

  # If not found, test this combination of libraries with a C interface.
  # A few implementations (ie ACML) provide a C interface. Unfortunately, there is no standard.
@@ -117,7 +117,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
    set(CMAKE_REQUIRED_LIBRARIES "")
    mark_as_advanced(${_prefix}_${_name}${_combined_name}_WORKS)
    set(_libraries_work ${${_prefix}_${_name}${_combined_name}_WORKS})
-  endif(_libraries_found AND NOT _libraries_work)
+  endif()

  # on failure
  if(NOT _libraries_work)
@@ -126,7 +126,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
  endif()
  #message("DEBUG: ${DEFINITIONS} = ${${DEFINITIONS}}")
  #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
-endmacro(check_lapack_libraries)
+endmacro()


 #
@@ -216,7 +216,7 @@ else()
      "${BLAS_LIBRARIES}"
      "${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR"
      )
-    endif ( NOT LAPACK_LIBRARIES )
+    endif ()

    # Generic LAPACK library?
    # This configuration *must* be the last try as this library is notably slow.
@@ -242,14 +242,14 @@ else()
  if(NOT LAPACK_FIND_QUIETLY)
    if(LAPACK_FOUND)
      message(STATUS "A library with LAPACK API found.")
-    else(LAPACK_FOUND)
+    else()
      if(LAPACK_FIND_REQUIRED)
        message(FATAL_ERROR "A required library with LAPACK API not found. Please specify library location.")
      else()
        message(STATUS "A library with LAPACK API not found. Please specify library location.")
      endif()
-    endif(LAPACK_FOUND)
-  endif(NOT LAPACK_FIND_QUIETLY)
+    endif()
+  endif()

  # Add variables to cache
  set( LAPACK_INCLUDE_DIR   "${LAPACK_INCLUDE_DIR}"
@@ -270,4 +270,4 @@ else()
  #message("DEBUG: LAPACK_LIBRARIES_DIR = ${LAPACK_LIBRARIES_DIR}")
  #message("DEBUG: LAPACK_FOUND = ${LAPACK_FOUND}")

-endif(NOT BLAS_FOUND)
+endif()
--- a/cmake/FindMPFR.cmake
+++ b/cmake/FindMPFR.cmake
@@ -32,16 +32,16 @@ find_path(MPFR_INCLUDES
 if(NOT MPFR_FIND_VERSION)
  if(NOT MPFR_FIND_VERSION_MAJOR)
    set(MPFR_FIND_VERSION_MAJOR 1)
-  endif(NOT MPFR_FIND_VERSION_MAJOR)
+  endif()
  if(NOT MPFR_FIND_VERSION_MINOR)
    set(MPFR_FIND_VERSION_MINOR 0)
-  endif(NOT MPFR_FIND_VERSION_MINOR)
+  endif()
  if(NOT MPFR_FIND_VERSION_PATCH)
    set(MPFR_FIND_VERSION_PATCH 0)
-  endif(NOT MPFR_FIND_VERSION_PATCH)
+  endif()

  set(MPFR_FIND_VERSION "${MPFR_FIND_VERSION_MAJOR}.${MPFR_FIND_VERSION_MINOR}.${MPFR_FIND_VERSION_PATCH}")
-endif(NOT MPFR_FIND_VERSION)
+endif()


 if(MPFR_INCLUDES)
@@ -65,11 +65,11 @@ if(MPFR_INCLUDES)
    set(MPFR_VERSION_OK FALSE)
    message(STATUS "MPFR version ${MPFR_VERSION} found in ${MPFR_INCLUDES}, "
                   "but at least version ${MPFR_FIND_VERSION} is required")
-  else(${MPFR_VERSION} VERSION_LESS ${MPFR_FIND_VERSION})
+  else()
    set(MPFR_VERSION_OK TRUE)
-  endif(${MPFR_VERSION} VERSION_LESS ${MPFR_FIND_VERSION})
+  endif()

-endif(MPFR_INCLUDES)
+endif()

 # Set MPFR_LIBRARIES

--- a/cmake/FindMetis.cmake
+++ b/cmake/FindMetis.cmake
@@ -238,7 +238,7 @@ if(METIS_LIBRARIES)
  set(CMAKE_REQUIRED_INCLUDES)
  set(CMAKE_REQUIRED_FLAGS)
  set(CMAKE_REQUIRED_LIBRARIES)
-endif(METIS_LIBRARIES)
+endif()

 if (METIS_LIBRARIES)
  list(GET METIS_LIBRARIES 0 first_lib)
--- a/cmake/FindPTSCOTCH.cmake
+++ b/cmake/FindPTSCOTCH.cmake
@@ -355,7 +355,7 @@ if(PTSCOTCH_LIBRARIES)
  set(CMAKE_REQUIRED_INCLUDES)
  set(CMAKE_REQUIRED_FLAGS)
  set(CMAKE_REQUIRED_LIBRARIES)
-endif(PTSCOTCH_LIBRARIES)
+endif()

 if (PTSCOTCH_LIBRARIES)
  list(GET PTSCOTCH_LIBRARIES 0 first_lib)
--- a/cmake/FindPastix.cmake
+++ b/cmake/FindPastix.cmake
@@ -238,7 +238,7 @@ if (NOT MPI_FOUND AND PASTIX_LOOK_FOR_MPI)
    mark_as_advanced(MPI_LIBRARY)
    mark_as_advanced(MPI_EXTRA_LIBRARY)
  endif()
-endif (NOT MPI_FOUND AND PASTIX_LOOK_FOR_MPI)
+endif ()

 # PASTIX may depend on STARPU
 #----------------------------
@@ -279,7 +279,7 @@ if( NOT STARPU_FOUND AND PASTIX_LOOK_FOR_STARPU)
      COMPONENTS ${STARPU_COMPONENT_LIST})
  endif()

-endif( NOT STARPU_FOUND AND PASTIX_LOOK_FOR_STARPU)
+endif()

 # PASTIX may depends on SCOTCH
 #-----------------------------
@@ -478,7 +478,7 @@ foreach(pastix_lib ${PASTIX_libs_to_find})
  endif()
  mark_as_advanced(PASTIX_${pastix_lib}_LIBRARY)

-endforeach(pastix_lib ${PASTIX_libs_to_find})
+endforeach()

 # check a function to validate the find
 if(PASTIX_LIBRARIES)
@@ -681,7 +681,7 @@ if(PASTIX_LIBRARIES)
  set(CMAKE_REQUIRED_INCLUDES)
  set(CMAKE_REQUIRED_FLAGS)
  set(CMAKE_REQUIRED_LIBRARIES)
-endif(PASTIX_LIBRARIES)
+endif()

 if (PASTIX_LIBRARIES)
  list(GET PASTIX_LIBRARIES 0 first_lib)
--- a/cmake/FindSPQR.cmake
+++ b/cmake/FindSPQR.cmake
@@ -6,7 +6,7 @@

 if (SPQR_INCLUDES AND SPQR_LIBRARIES)
  set(SPQR_FIND_QUIETLY TRUE)
-endif (SPQR_INCLUDES AND SPQR_LIBRARIES)
+endif ()

 find_path(SPQR_INCLUDES
  NAMES
@@ -33,7 +33,7 @@ if(SPQR_LIBRARIES)
    set(SPQR_LIBRARIES ${SPQR_LIBRARIES} ${CHOLMOD_LIBRARY})
  endif()
  
-endif(SPQR_LIBRARIES)
+endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SPQR DEFAULT_MSG SPQR_INCLUDES SPQR_LIBRARIES)
--- a/cmake/FindScotch.cmake
+++ b/cmake/FindScotch.cmake
@@ -301,7 +301,7 @@ if(SCOTCH_LIBRARIES)
  set(CMAKE_REQUIRED_INCLUDES)
  set(CMAKE_REQUIRED_FLAGS)
  set(CMAKE_REQUIRED_LIBRARIES)
-endif(SCOTCH_LIBRARIES)
+endif()

 if (SCOTCH_LIBRARIES)
  list(GET SCOTCH_LIBRARIES 0 first_lib)
--- a/cmake/FindSuperLU.cmake
+++ b/cmake/FindSuperLU.cmake
@@ -4,7 +4,7 @@

 if (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES)
  set(SUPERLU_FIND_QUIETLY TRUE)
-endif (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES)
+endif ()

 find_path(SUPERLU_INCLUDES
  NAMES
--- a/cmake/FindTriSYCL.cmake
+++ b/cmake/FindTriSYCL.cmake
@@ -72,7 +72,7 @@ if(TRISYCL_OPENCL)
  if(UNIX)
    set(BOOST_COMPUTE_INCPATH /usr/include/compute CACHE PATH
      "Path to Boost.Compute headers (default is: /usr/include/compute)")
-  endif(UNIX)
+  endif()
 endif()

 # Find OpenMP package
@@ -147,6 +147,6 @@ function(add_sycl_to_target targetName sourceFile binaryDir)
    set_target_properties(${targetName}
      PROPERTIES
      LINK_FLAGS ${OpenMP_CXX_FLAGS})
-  endif(${TRISYCL_OPENMP} AND (NOT WIN32))
+  endif()

-endfunction(add_sycl_to_target)
+endfunction()
--- a/cmake/FindUmfpack.cmake
+++ b/cmake/FindUmfpack.cmake
@@ -3,7 +3,7 @@

 if (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES)
  set(UMFPACK_FIND_QUIETLY TRUE)
-endif (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES)
+endif ()

 find_path(UMFPACK_INCLUDES
  NAMES
@@ -22,7 +22,7 @@ if(UMFPACK_LIBRARIES)

  if(NOT UMFPACK_LIBDIR)
    get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH)
-  endif(NOT UMFPACK_LIBDIR)
+  endif()

  find_library(COLAMD_LIBRARY colamd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
  if(COLAMD_LIBRARY)
@@ -44,7 +44,7 @@ if(UMFPACK_LIBRARIES)
    set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${CHOLMOD_LIBRARY})
  endif()

-endif(UMFPACK_LIBRARIES)
+endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(UMFPACK DEFAULT_MSG
--- a/cmake/RegexUtils.cmake
+++ b/cmake/RegexUtils.cmake
@@ -15,5 +15,5 @@ function(test_escape_string_as_regex)
  SET(testRef "\\\\\\.\\^\\$\\-\\+\\*\\(\\)\\[\\]\\?\\|")
  if(NOT test2 STREQUAL testRef)
 	message("Error in the escape_string_for_regex function : \n   ${test1} was escaped as ${test2}, should be ${testRef}")
-  endif(NOT test2 STREQUAL testRef)
+  endif()
 endfunction()
--- a/cmake/language_support.cmake
+++ b/cmake/language_support.cmake
@@ -51,13 +51,13 @@ function(workaround_9220 language language_works)
      )
    if(return_code EQUAL 0)
      set(${language_works} ON PARENT_SCOPE)
-    else(return_code EQUAL 0)
+    else()
      set(${language_works} OFF PARENT_SCOPE)
-    endif(return_code EQUAL 0)
-  else(return_code EQUAL 0)
+    endif()
+  else()
    set(${language_works} OFF PARENT_SCOPE)
-  endif(return_code EQUAL 0)
-endfunction(workaround_9220)
+  endif()
+endfunction()

 # Temporary tests of the above function.
 #workaround_9220(CXX CXX_language_works)