From: Matthias Maier <tamiko@43-1.org>
Date: Sat, 26 Nov 2022 16:15:54 +0000 (-0600)
Subject: CMake: run contrib/utilities/lowercase_cmake
X-Git-Tag: v9.5.0-rc1~805^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f40c9d6b775261ea5cad01f8437e9dcb754de75a;p=dealii.git

CMake: run contrib/utilities/lowercase_cmake
---

diff --git a/cmake/configure/configure_10_lapack.cmake b/cmake/configure/configure_10_lapack.cmake
index 13e3a1a063..01b5b68ed1 100644
--- a/cmake/configure/configure_10_lapack.cmake
+++ b/cmake/configure/configure_10_lapack.cmake
@@ -17,7 +17,7 @@
 # Configuration for the lapack library:
 #
 
-macro(FEATURE_LAPACK_FIND_EXTERNAL var)
+macro(feature_lapack_find_external var)
   clear_cmake_required()
   find_package(DEAL_II_LAPACK)
 
diff --git a/cmake/configure/configure_10_mpi.cmake b/cmake/configure/configure_10_mpi.cmake
index 83473dc04c..b31a85cffb 100644
--- a/cmake/configure/configure_10_mpi.cmake
+++ b/cmake/configure/configure_10_mpi.cmake
@@ -24,7 +24,7 @@ set(DEAL_II_WITH_MPI OFF CACHE BOOL "")
 # Configuration for mpi support:
 #
 
-macro(FEATURE_MPI_FIND_EXTERNAL var)
+macro(feature_mpi_find_external var)
   find_package(DEAL_II_MPI)
 
   if(MPI_FOUND)
@@ -51,7 +51,7 @@ macro(FEATURE_MPI_FIND_EXTERNAL var)
   endif()
 endmacro()
 
-macro(FEATURE_MPI_CONFIGURE_EXTERNAL)
+macro(feature_mpi_configure_external)
 
   #
   # We must convert the MPIEXEC_(PRE|POST)FLAGS strings to lists in order
@@ -69,7 +69,7 @@ macro(FEATURE_MPI_CONFIGURE_EXTERNAL)
   mark_as_advanced(DEAL_II_MPI_WITH_CUDA_SUPPORT)
 endmacro()
 
-macro(FEATURE_MPI_ERROR_MESSAGE)
+macro(feature_mpi_error_message)
   message(FATAL_ERROR "\n"
     "Could not find any suitable mpi library!\n"
     ${MPI_ADDITIONAL_ERROR_STRING}
diff --git a/cmake/configure/configure_10_taskflow.cmake b/cmake/configure/configure_10_taskflow.cmake
index 6696d8304f..a713948d67 100644
--- a/cmake/configure/configure_10_taskflow.cmake
+++ b/cmake/configure/configure_10_taskflow.cmake
@@ -24,7 +24,7 @@
 #
 set(DEAL_II_WITH_TASKFLOW OFF CACHE BOOL "")
 
-macro(FEATURE_TASKFLOW_FIND_EXTERNAL var)
+macro(feature_taskflow_find_external var)
   find_package(DEAL_II_TASKFLOW)
 
   if(TASKFLOW_FOUND)
@@ -70,7 +70,7 @@ macro(FEATURE_TASKFLOW_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_TASKFLOW_CONFIGURE_BUNDLED)
+macro(feature_taskflow_configure_bundled)
   list(APPEND TASKFLOW_BUNDLED_INCLUDE_DIRS ${TASKFLOW_FOLDER}/include)
 endmacro()
 
diff --git a/cmake/configure/configure_10_tbb.cmake b/cmake/configure/configure_10_tbb.cmake
index baefb65ed4..76e846fcf6 100644
--- a/cmake/configure/configure_10_tbb.cmake
+++ b/cmake/configure/configure_10_tbb.cmake
@@ -18,7 +18,7 @@
 # library:
 #
 
-macro(FEATURE_TBB_FIND_EXTERNAL var)
+macro(feature_tbb_find_external var)
   find_package(DEAL_II_TBB)
 
   if(TBB_FOUND)
@@ -65,7 +65,7 @@ macro(FEATURE_TBB_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_TBB_CONFIGURE_BUNDLED)
+macro(feature_tbb_configure_bundled)
   #
   # We have to disable a bunch of warnings:
   #
diff --git a/cmake/configure/configure_20_boost.cmake b/cmake/configure/configure_20_boost.cmake
index 738aaeab99..295616fda6 100644
--- a/cmake/configure/configure_20_boost.cmake
+++ b/cmake/configure/configure_20_boost.cmake
@@ -32,7 +32,7 @@ set(DEAL_II_WITH_BOOST ON # Always true. We need it :-]
   )
 
 
-macro(FEATURE_BOOST_CONFIGURE_COMMON)
+macro(feature_boost_configure_common)
   # Some standard library implementations do not implement std::auto_ptr
   # (anymore) which was deprecated for C++11 and removed in the C++17 standard.
   # Older boost versions can't know about this but provide a possibility to
@@ -100,7 +100,7 @@ macro(FEATURE_BOOST_CONFIGURE_COMMON)
 endmacro()
 
 
-macro(FEATURE_BOOST_CONFIGURE_BUNDLED)
+macro(feature_boost_configure_bundled)
   #
   # Add rt to the link interface as well, boost/chrono needs it.
   #
@@ -142,7 +142,7 @@ macro(FEATURE_BOOST_CONFIGURE_BUNDLED)
   endif()
 endmacro()
 
-macro(FEATURE_BOOST_FIND_EXTERNAL var)
+macro(feature_boost_find_external var)
   find_package(DEAL_II_BOOST)
 
   if(BOOST_FOUND)
@@ -255,7 +255,7 @@ macro(FEATURE_BOOST_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_BOOST_CONFIGURE_EXTERNAL)
+macro(feature_boost_configure_external)
   FEATURE_BOOST_CONFIGURE_COMMON()
 endmacro()
 
diff --git a/cmake/configure/configure_20_ginkgo.cmake b/cmake/configure/configure_20_ginkgo.cmake
index d876dc6b82..43e6a10bec 100644
--- a/cmake/configure/configure_20_ginkgo.cmake
+++ b/cmake/configure/configure_20_ginkgo.cmake
@@ -17,7 +17,7 @@
 # Configuration for the Ginkgo library:
 #
 
-macro(FEATURE_GINKGO_FIND_EXTERNAL var)
+macro(feature_ginkgo_find_external var)
   find_package(DEAL_II_GINKGO)
 
   if(GINKGO_FOUND)
diff --git a/cmake/configure/configure_20_metis.cmake b/cmake/configure/configure_20_metis.cmake
index 032a4ce642..cc0cb158dd 100644
--- a/cmake/configure/configure_20_metis.cmake
+++ b/cmake/configure/configure_20_metis.cmake
@@ -19,7 +19,7 @@ set(FEATURE_METIS_AFTER MPI)
 # Configuration for the metis library:
 #
 
-macro(FEATURE_METIS_FIND_EXTERNAL var)
+macro(feature_metis_find_external var)
   find_package(DEAL_II_METIS)
 
   if(METIS_FOUND)
diff --git a/cmake/configure/configure_20_trilinos.cmake b/cmake/configure/configure_20_trilinos.cmake
index e8a235bfa7..ea317beb7a 100644
--- a/cmake/configure/configure_20_trilinos.cmake
+++ b/cmake/configure/configure_20_trilinos.cmake
@@ -19,7 +19,7 @@
 
 set(FEATURE_TRILINOS_DEPENDS MPI)
 
-macro(FEATURE_TRILINOS_FIND_EXTERNAL var)
+macro(feature_trilinos_find_external var)
   find_package(DEAL_II_TRILINOS)
 
   if(TRILINOS_FOUND)
@@ -374,7 +374,7 @@ macro(FEATURE_TRILINOS_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_TRILINOS_CONFIGURE_EXTERNAL)
+macro(feature_trilinos_configure_external)
   set(DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN "TrilinosWrappers::SparsityPattern")
   set(DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN "TrilinosWrappers::BlockSparsityPattern")
   set(DEAL_II_EXPAND_TRILINOS_SPARSE_MATRICES 
diff --git a/cmake/configure/configure_20_umfpack.cmake b/cmake/configure/configure_20_umfpack.cmake
index 8471406871..5c2bfc04eb 100644
--- a/cmake/configure/configure_20_umfpack.cmake
+++ b/cmake/configure/configure_20_umfpack.cmake
@@ -19,14 +19,14 @@
 
 set(FEATURE_UMFPACK_DEPENDS LAPACK)
 
-macro(FEATURE_UMFPACK_CONFIGURE_BUNDLED)
+macro(feature_umfpack_configure_bundled)
   set(UMFPACK_BUNDLED_INCLUDE_DIRS
     ${UMFPACK_FOLDER}/UMFPACK/Include
     ${UMFPACK_FOLDER}/AMD/Include
     )
 endmacro()
 
-macro(FEATURE_UMFPACK_ERROR_MESSAGE)
+macro(feature_umfpack_error_message)
   message(FATAL_ERROR "\n"
     "Could not find umfpack and supporting libraries!\n"
     "Please ensure that the libraries are installed on your computer.\n"
diff --git a/cmake/configure/configure_30_kokkos.cmake b/cmake/configure/configure_30_kokkos.cmake
index 4f1e75ba27..d744e42e5b 100644
--- a/cmake/configure/configure_30_kokkos.cmake
+++ b/cmake/configure/configure_30_kokkos.cmake
@@ -21,7 +21,7 @@ set(DEAL_II_WITH_KOKKOS ON # Always true. We need it :-]
   CACHE BOOL "Build deal.II with support for Kokkos." FORCE
   )
 
-macro(FEATURE_KOKKOS_CONFIGURE_BUNDLED)
+macro(feature_kokkos_configure_bundled)
   set(KOKKOS_BUNDLED_INCLUDE_DIRS
     ${KOKKOS_FOLDER}/algorithms/src
     ${KOKKOS_FOLDER}/containers/src
diff --git a/cmake/configure/configure_30_petsc.cmake b/cmake/configure/configure_30_petsc.cmake
index 8bb5dd695b..2411f5d11f 100644
--- a/cmake/configure/configure_30_petsc.cmake
+++ b/cmake/configure/configure_30_petsc.cmake
@@ -20,7 +20,7 @@
 set(FEATURE_PETSC_AFTER MPI)
 
 
-macro(FEATURE_PETSC_FIND_EXTERNAL var)
+macro(feature_petsc_find_external var)
   find_package(DEAL_II_PETSC)
 
   if(PETSC_FOUND)
@@ -117,7 +117,7 @@ macro(FEATURE_PETSC_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_PETSC_CONFIGURE_EXTERNAL)
+macro(feature_petsc_configure_external)
   set(DEAL_II_EXPAND_PETSC_MPI_VECTOR "PETScWrappers::MPI::Vector")
   set(DEAL_II_EXPAND_PETSC_MPI_BLOCKVECTOR "PETScWrappers::MPI::BlockVector")
   set(DEAL_II_EXPAND_PETSC_SPARSE_MATRICES
@@ -136,7 +136,7 @@ macro(FEATURE_PETSC_CONFIGURE_EXTERNAL)
 endmacro()
 
 
-macro(FEATURE_PETSC_ERROR_MESSAGE)
+macro(feature_petsc_error_message)
   message(FATAL_ERROR "\n"
     "Could not find the petsc library!\n"
     ${PETSC_ADDITIONAL_ERROR_STRING}
diff --git a/cmake/configure/configure_40_cuda.cmake b/cmake/configure/configure_40_cuda.cmake
index 4752c47601..475ba7d6e7 100644
--- a/cmake/configure/configure_40_cuda.cmake
+++ b/cmake/configure/configure_40_cuda.cmake
@@ -22,7 +22,7 @@
 #
 set(DEAL_II_WITH_CUDA FALSE CACHE BOOL "")
 
-macro(FEATURE_CUDA_FIND_EXTERNAL var)
+macro(feature_cuda_find_external var)
   if(NOT Kokkos_ENABLE_CUDA)
     set(CUDA_ADDITIONAL_ERROR_STRING
       ${CUDA_ADDITIONAL_ERROR_STRING}
@@ -103,7 +103,7 @@ macro(FEATURE_CUDA_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_CUDA_CONFIGURE_EXTERNAL)
+macro(feature_cuda_configure_external)
   # We cannot use -pedantic as compiler flags. nvcc generates code that
   # produces a lot of warnings when pedantic is enabled. So filter out the
   # flag:
@@ -112,7 +112,7 @@ macro(FEATURE_CUDA_CONFIGURE_EXTERNAL)
 endmacro()
 
 
-macro(FEATURE_CUDA_ERROR_MESSAGE)
+macro(feature_cuda_error_message)
   message(FATAL_ERROR "\n"
     "Could not find any suitable cuda library!\n"
     ${CUDA_ADDITIONAL_ERROR_STRING}
diff --git a/cmake/configure/configure_50_adolc.cmake b/cmake/configure/configure_50_adolc.cmake
index 248ea43ebc..f7ed664538 100644
--- a/cmake/configure/configure_50_adolc.cmake
+++ b/cmake/configure/configure_50_adolc.cmake
@@ -19,7 +19,7 @@
 
 set(FEATURE_ADOLC_AFTER BOOST TRILINOS)
 
-macro(FEATURE_ADOLC_FIND_EXTERNAL var)
+macro(feature_adolc_find_external var)
   find_package(DEAL_II_ADOLC)
 
   if(ADOLC_FOUND)
@@ -161,7 +161,7 @@ macro(FEATURE_ADOLC_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_ADOLC_CONFIGURE_EXTERNAL)
+macro(feature_adolc_configure_external)
   set(DEAL_II_ADOLC_WITH_ADVANCED_BRANCHING ${ADOLC_WITH_ADVANCED_BRANCHING})
   set(DEAL_II_ADOLC_WITH_ATRIG_ERF ${ADOLC_WITH_ATRIG_ERF})
   set(DEAL_II_ADOLC_WITH_TAPELESS_REFCOUNTING ${ADOLC_WITH_TAPELESS_REFCOUNTING})
diff --git a/cmake/configure/configure_50_arborx.cmake b/cmake/configure/configure_50_arborx.cmake
index 5fc0bbd2b0..29349daf0b 100644
--- a/cmake/configure/configure_50_arborx.cmake
+++ b/cmake/configure/configure_50_arborx.cmake
@@ -20,7 +20,7 @@
 set(FEATURE_ARBORX_AFTER MPI)
 set(FEATURE_ARBORX_DEPENDS KOKKOS)
 
-macro(FEATURE_ARBORX_FIND_EXTERNAL var)
+macro(feature_arborx_find_external var)
   find_package(ARBORX)
 
   if(ARBORX_FOUND)
diff --git a/cmake/configure/configure_50_cgal.cmake b/cmake/configure/configure_50_cgal.cmake
index eecc717e7f..968b841b70 100644
--- a/cmake/configure/configure_50_cgal.cmake
+++ b/cmake/configure/configure_50_cgal.cmake
@@ -27,7 +27,7 @@ if(NOT FEATURE_BOOST_PROCESSED)
 endif()
 
 
-macro(FEATURE_CGAL_FIND_EXTERNAL var)
+macro(feature_cgal_find_external var)
   find_package(DEAL_II_CGAL)
 
   if(CGAL_FOUND)
@@ -55,7 +55,7 @@ macro(FEATURE_CGAL_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_CGAL_CONFIGURE_EXTERNAL)
+macro(feature_cgal_configure_external)
   # Similarly to the DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS check run
   # in configure_20_boost.cmake we have to check whether cgal includes
   # a deprecated boost header. If yes, disable the boost deprecated header
diff --git a/cmake/configure/configure_50_hdf5.cmake b/cmake/configure/configure_50_hdf5.cmake
index 78a70da1d4..35c9bbe335 100644
--- a/cmake/configure/configure_50_hdf5.cmake
+++ b/cmake/configure/configure_50_hdf5.cmake
@@ -19,7 +19,7 @@
 
 set(FEATURE_HDF5_DEPENDS MPI)
 
-macro(FEATURE_HDF5_FIND_EXTERNAL var)
+macro(feature_hdf5_find_external var)
   find_package(DEAL_II_HDF5)
 
   if(HDF5_FOUND)
diff --git a/cmake/configure/configure_50_muparser.cmake b/cmake/configure/configure_50_muparser.cmake
index 22a95f895f..b1d6f4c206 100644
--- a/cmake/configure/configure_50_muparser.cmake
+++ b/cmake/configure/configure_50_muparser.cmake
@@ -17,7 +17,7 @@
 # Configuration for the MUPARSER library:
 #
 
-macro(FEATURE_MUPARSER_CONFIGURE_BUNDLED)
+macro(feature_muparser_configure_bundled)
   set(MUPARSER_BUNDLED_INCLUDE_DIRS ${MUPARSER_FOLDER}/include)
 endmacro()
 
diff --git a/cmake/configure/configure_50_p4est.cmake b/cmake/configure/configure_50_p4est.cmake
index 43328d40bf..0c04934a34 100644
--- a/cmake/configure/configure_50_p4est.cmake
+++ b/cmake/configure/configure_50_p4est.cmake
@@ -20,7 +20,7 @@
 set(FEATURE_P4EST_DEPENDS MPI)
 
 
-macro(FEATURE_P4EST_FIND_EXTERNAL var)
+macro(feature_p4est_find_external var)
   find_package(DEAL_II_P4EST)
 
   if(P4EST_FOUND)
@@ -75,7 +75,7 @@ macro(FEATURE_P4EST_FIND_EXTERNAL var)
   endif()
 endmacro()
 
-macro(FEATURE_P4EST_CONFIGURE_EXTERNAL)
+macro(feature_p4est_configure_external)
   set(DEAL_II_P4EST_WITH_VTK_BINARY ${P4EST_WITH_VTK_BINARY})
   set(DEAL_II_P4EST_WITH_SEARCH_LOCAL ${P4EST_WITH_SEARCH_LOCAL})
 endmacro()
diff --git a/cmake/configure/configure_50_scalapack.cmake b/cmake/configure/configure_50_scalapack.cmake
index 4e5a749a1a..37a30bc928 100644
--- a/cmake/configure/configure_50_scalapack.cmake
+++ b/cmake/configure/configure_50_scalapack.cmake
@@ -20,7 +20,7 @@
 set(FEATURE_SCALAPACK_DEPENDS MPI LAPACK)
 
 
-macro(FEATURE_SCALAPACK_FIND_EXTERNAL var)
+macro(feature_scalapack_find_external var)
   find_package(DEAL_II_SCALAPACK)
 
   if(SCALAPACK_FOUND)
diff --git a/cmake/configure/configure_50_slepc.cmake b/cmake/configure/configure_50_slepc.cmake
index fa272f6e6e..3dc135565a 100644
--- a/cmake/configure/configure_50_slepc.cmake
+++ b/cmake/configure/configure_50_slepc.cmake
@@ -20,7 +20,7 @@
 set(FEATURE_SLEPC_DEPENDS PETSC)
 
 
-macro(FEATURE_SLEPC_FIND_EXTERNAL var)
+macro(feature_slepc_find_external var)
   find_package(DEAL_II_SLEPC)
 
   if(SLEPC_FOUND)
@@ -50,7 +50,7 @@ macro(FEATURE_SLEPC_FIND_EXTERNAL var)
 endmacro()
 
 
-macro(FEATURE_SLEPC_ERROR_MESSAGE)
+macro(feature_slepc_error_message)
   message(FATAL_ERROR "\n"
     "Could not find the SLEPc library!\n"
     ${SLEPC_ADDITIONAL_ERROR_STRING}
diff --git a/cmake/configure/configure_50_sundials.cmake b/cmake/configure/configure_50_sundials.cmake
index b6b6eb19ba..85aed212f0 100644
--- a/cmake/configure/configure_50_sundials.cmake
+++ b/cmake/configure/configure_50_sundials.cmake
@@ -17,7 +17,7 @@
 # Configuration for the SUNDIALS library:
 #
 
-macro(FEATURE_SUNDIALS_FIND_EXTERNAL var)
+macro(feature_sundials_find_external var)
   find_package(DEAL_II_SUNDIALS)
 
   if(SUNDIALS_FOUND)
@@ -43,7 +43,7 @@ macro(FEATURE_SUNDIALS_FIND_EXTERNAL var)
   endif()
 endmacro()
 
-macro(FEATURE_SUNDIALS_CONFIGURE_EXTERNAL)
+macro(feature_sundials_configure_external)
   set(DEAL_II_SUNDIALS_WITH_IDAS ${SUNDIALS_WITH_IDAS})
 endmacro()
 
diff --git a/cmake/configure/configure_50_symengine.cmake b/cmake/configure/configure_50_symengine.cmake
index ebe20e3f83..4a855efb33 100644
--- a/cmake/configure/configure_50_symengine.cmake
+++ b/cmake/configure/configure_50_symengine.cmake
@@ -18,7 +18,7 @@
 #
 
 
-macro(FEATURE_SYMENGINE_FIND_EXTERNAL var)
+macro(feature_symengine_find_external var)
   find_package(DEAL_II_SYMENGINE)
 
   if(SYMENGINE_FOUND)
@@ -44,7 +44,7 @@ macro(FEATURE_SYMENGINE_FIND_EXTERNAL var)
   endif()
 endmacro()
 
-macro(FEATURE_SYMENGINE_CONFIGURE_EXTERNAL)
+macro(feature_symengine_configure_external)
   set(DEAL_II_SYMENGINE_WITH_LLVM ${SYMENGINE_WITH_LLVM})
 
   if(DEAL_II_SYMENGINE_WITH_LLVM)
diff --git a/cmake/macros/macro_add_flags.cmake b/cmake/macros/macro_add_flags.cmake
index 20548e4ec6..9e18afaa5b 100644
--- a/cmake/macros/macro_add_flags.cmake
+++ b/cmake/macros/macro_add_flags.cmake
@@ -21,7 +21,7 @@
 #     add_flags(variable flags)
 #
 
-macro(ADD_FLAGS _variable _flags)
+macro(add_flags _variable _flags)
   string(STRIP "${_flags}" _flags_stripped)
   if(NOT "${_flags_stripped}" STREQUAL "")
     set(${_variable} "${${_variable}} ${_flags}")
diff --git a/cmake/macros/macro_check_compiler_setup.cmake b/cmake/macros/macro_check_compiler_setup.cmake
index a39b2df093..2873665853 100644
--- a/cmake/macros/macro_check_compiler_setup.cmake
+++ b/cmake/macros/macro_check_compiler_setup.cmake
@@ -25,7 +25,7 @@
 # ${_var} is set to true, otherwise it is set to false.
 #
 
-macro(CHECK_COMPILER_SETUP _compiler_flags_unstr _linker_flags_unstr _var)
+macro(check_compiler_setup _compiler_flags_unstr _linker_flags_unstr _var)
   #
   # Strip leading and trailing whitespace to make CMake 2.8.8 happy
   #
diff --git a/cmake/macros/macro_check_cxx_compiler_bug.cmake b/cmake/macros/macro_check_cxx_compiler_bug.cmake
index 0c84d317f5..e1daee3e5c 100644
--- a/cmake/macros/macro_check_cxx_compiler_bug.cmake
+++ b/cmake/macros/macro_check_cxx_compiler_bug.cmake
@@ -24,7 +24,7 @@
 # (This just inverts the logic of CHECK_CXX_SOURCE_COMPILES.)
 #
 
-macro(CHECK_CXX_COMPILER_BUG _source _var)
+macro(check_cxx_compiler_bug _source _var)
   if(NOT DEFINED ${_var}_OK)
     CHECK_CXX_SOURCE_COMPILES(
       "${_source}"
diff --git a/cmake/macros/macro_check_mpi_interface.cmake b/cmake/macros/macro_check_mpi_interface.cmake
index bb8641ec8e..ac2d0a0ff6 100644
--- a/cmake/macros/macro_check_mpi_interface.cmake
+++ b/cmake/macros/macro_check_mpi_interface.cmake
@@ -21,7 +21,7 @@
 #     check_mpi_interface(_feature _var),
 #
 
-macro(CHECK_MPI_INTERFACE _feature _var)
+macro(check_mpi_interface _feature _var)
   if(DEAL_II_WITH_MPI AND MPI_LIBRARIES)
 
     set(_nope FALSE)
diff --git a/cmake/macros/macro_clear_cmake_required.cmake b/cmake/macros/macro_clear_cmake_required.cmake
index bafbf463e6..f8bb0cf004 100644
--- a/cmake/macros/macro_clear_cmake_required.cmake
+++ b/cmake/macros/macro_clear_cmake_required.cmake
@@ -20,7 +20,7 @@
 #     CLEAR_CMAKE_REQUIRED_FLAGS
 #
 
-macro(CLEAR_CMAKE_REQUIRED)
+macro(clear_cmake_required)
   set(CMAKE_REQUIRED_FLAGS)
   set(CMAKE_REQUIRED_INCLUDES)
   set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/cmake/macros/macro_clear_feature.cmake b/cmake/macros/macro_clear_feature.cmake
index dc521cc608..b0999da355 100644
--- a/cmake/macros/macro_clear_feature.cmake
+++ b/cmake/macros/macro_clear_feature.cmake
@@ -24,7 +24,7 @@
 # DEAL_II_STRING_SUFFIXES to the corresponding DEAL_II_* variables
 #
 
-macro(CLEAR_FEATURE _feature)
+macro(clear_feature _feature)
   foreach(_var ${DEAL_II_LIST_SUFFIXES} ${DEAL_II_STRING_SUFFIXES})
     unset(${_feature}_${_var})
   endforeach()
diff --git a/cmake/macros/macro_configure_feature.cmake b/cmake/macros/macro_configure_feature.cmake
index 59001fa871..0fee70a769 100644
--- a/cmake/macros/macro_configure_feature.cmake
+++ b/cmake/macros/macro_configure_feature.cmake
@@ -71,7 +71,7 @@
 #
 # A small macro to set the DEAL_II_WITH_${_feature} variables:
 #
-macro(SET_CACHED_OPTION _str _value)
+macro(set_cached_option _str _value)
   string(TOLOWER "${_str}" _str_lower)
   set(DEAL_II_WITH_${_str}
     ${_value}
@@ -84,7 +84,7 @@ endmacro()
 #
 # A small macro to post a default error message:
 #
-macro(FEATURE_ERROR_MESSAGE _feature)
+macro(feature_error_message _feature)
   string(TOLOWER ${_feature} _feature_lowercase)
 
   if(DEFINED ${_feature}_DIR)
@@ -123,7 +123,7 @@ endmacro()
 #
 # Default macro for finding an external library:
 #
-macro(FEATURE_FIND_EXTERNAL _feature _var)
+macro(feature_find_external _feature _var)
   find_package(DEAL_II_${_feature})
   if(${_feature}_FOUND)
     set(${_var} TRUE)
@@ -137,7 +137,7 @@ endmacro()
 #                                                                      #
 ########################################################################
 
-macro(CONFIGURE_FEATURE _feature)
+macro(configure_feature _feature)
 
   #
   # Register the feature in the DEAL_II_FEATURES list
@@ -229,7 +229,7 @@ macro(CONFIGURE_FEATURE _feature)
             )
         endif()
 
-      else(DEAL_II_FORCE_BUNDLED_${_feature})
+      else()
         #
         # Second case: We are allowed to search for an external library
         #
@@ -248,7 +248,7 @@ macro(CONFIGURE_FEATURE _feature)
           set(FEATURE_${_feature}_EXTERNAL_CONFIGURED TRUE)
           set_cached_option(${_feature} ON)
 
-        else(FEATURE_${_feature}_EXTERNAL_FOUND)
+        else()
 
           purge_feature(${_feature})
 
@@ -273,7 +273,7 @@ macro(CONFIGURE_FEATURE _feature)
             endif()
           endif()
 
-        endif(FEATURE_${_feature}_EXTERNAL_FOUND)
+        endif()
 
       endif()
     endif()
diff --git a/cmake/macros/macro_deal_ii_add_definitions.cmake b/cmake/macros/macro_deal_ii_add_definitions.cmake
index 1cf7565cfe..c306c9c219 100644
--- a/cmake/macros/macro_deal_ii_add_definitions.cmake
+++ b/cmake/macros/macro_deal_ii_add_definitions.cmake
@@ -19,7 +19,7 @@
 # to _add_ compile definitions to every target we have specified.
 #
 
-macro(DEAL_II_ADD_DEFINITIONS _name)
+macro(deal_ii_add_definitions _name)
 
   foreach(_build ${DEAL_II_BUILD_TYPES})
     string(TOLOWER ${_build} _build_lowercase)
diff --git a/cmake/macros/macro_deal_ii_add_library.cmake b/cmake/macros/macro_deal_ii_add_library.cmake
index 6341b03b8a..939f6bb88a 100644
--- a/cmake/macros/macro_deal_ii_add_library.cmake
+++ b/cmake/macros/macro_deal_ii_add_library.cmake
@@ -27,7 +27,7 @@
 #   DEAL_II_DEFINITIONS
 #
 
-macro(DEAL_II_ADD_LIBRARY _library)
+macro(deal_ii_add_library _library)
 
   foreach(_build ${DEAL_II_BUILD_TYPES})
     string(TOLOWER ${_build} _build_lowercase)
diff --git a/cmake/macros/macro_deal_ii_add_test.cmake b/cmake/macros/macro_deal_ii_add_test.cmake
index 98b54a594f..3028e519eb 100644
--- a/cmake/macros/macro_deal_ii_add_test.cmake
+++ b/cmake/macros/macro_deal_ii_add_test.cmake
@@ -103,7 +103,7 @@
 #     deal_ii_add_test(category test_name comparison_file)
 #
 
-function(DEAL_II_ADD_TEST _category _test_name _comparison_file)
+function(deal_ii_add_test _category _test_name _comparison_file)
 
   if(NOT TARGET compile_test_executables)
     add_custom_target(compile_test_executables)
diff --git a/cmake/macros/macro_deal_ii_find_file.cmake b/cmake/macros/macro_deal_ii_find_file.cmake
index f400e381f7..18ab3e4e7d 100644
--- a/cmake/macros/macro_deal_ii_find_file.cmake
+++ b/cmake/macros/macro_deal_ii_find_file.cmake
@@ -17,7 +17,7 @@
 # A small wrapper around FIND_FILE to be a bit more verbose
 #
 
-macro(DEAL_II_FIND_FILE _file_name)
+macro(deal_ii_find_file _file_name)
   # Save a string representation of the arguments before cmake's
   # FIND_FILE gets its hands on it.
   to_string(_str ${ARGN})
diff --git a/cmake/macros/macro_deal_ii_find_library.cmake b/cmake/macros/macro_deal_ii_find_library.cmake
index 1df6611c57..8348ba18d5 100644
--- a/cmake/macros/macro_deal_ii_find_library.cmake
+++ b/cmake/macros/macro_deal_ii_find_library.cmake
@@ -17,7 +17,7 @@
 # A small wrapper around FIND_LIBRARY to be a bit more verbose
 #
 
-macro(DEAL_II_FIND_LIBRARY _library_name)
+macro(deal_ii_find_library _library_name)
   # Save a string representation of the arguments before cmake's
   # FIND_FILE gets its hands on it.
   to_string(_str ${ARGN})
diff --git a/cmake/macros/macro_deal_ii_find_path.cmake b/cmake/macros/macro_deal_ii_find_path.cmake
index ce7977b447..5eb5f167ea 100644
--- a/cmake/macros/macro_deal_ii_find_path.cmake
+++ b/cmake/macros/macro_deal_ii_find_path.cmake
@@ -17,7 +17,7 @@
 # A small wrapper around FIND_FILE to be a bit more verbose
 #
 
-macro(DEAL_II_FIND_PATH _path_name)
+macro(deal_ii_find_path _path_name)
   # Save a string representation of the arguments before cmake's
   # FIND_PATH gets its hands on it.
   to_string(_str ${ARGN})
diff --git a/cmake/macros/macro_deal_ii_find_program.cmake b/cmake/macros/macro_deal_ii_find_program.cmake
index 362a10bec3..2eb5d6d497 100644
--- a/cmake/macros/macro_deal_ii_find_program.cmake
+++ b/cmake/macros/macro_deal_ii_find_program.cmake
@@ -17,7 +17,7 @@
 # A small wrapper around FIND_PROGRAM to be a bit more verbose
 #
 
-macro(DEAL_II_FIND_PROGRAM _file_name)
+macro(deal_ii_find_program _file_name)
   # Save a string representation of the arguments before cmake's
   # FIND_PROGRAM gets its hands on it.
   to_string(_str ${ARGN})
diff --git a/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake b/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake
index be3a102c0d..c207a18422 100644
--- a/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake
+++ b/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake
@@ -26,7 +26,7 @@
 # This macro has to be called before project()!
 #
 
-macro(DEAL_II_INITIALIZE_CACHED_VARIABLES)
+macro(deal_ii_initialize_cached_variables)
 
   if(NOT DEAL_II_PROJECT_CONFIG_INCLUDED)
     message(FATAL_ERROR
diff --git a/cmake/macros/macro_deal_ii_insource_setup_target.cmake b/cmake/macros/macro_deal_ii_insource_setup_target.cmake
index 9febffccda..0e11f0951a 100644
--- a/cmake/macros/macro_deal_ii_insource_setup_target.cmake
+++ b/cmake/macros/macro_deal_ii_insource_setup_target.cmake
@@ -24,7 +24,7 @@
 #
 #
 
-macro(DEAL_II_INSOURCE_SETUP_TARGET _target _build)
+macro(deal_ii_insource_setup_target _target _build)
   string(TOLOWER ${_build} _build_lowercase)
 
   set_target_properties(${_target} PROPERTIES
diff --git a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
index 0701866727..26fd8736f4 100644
--- a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
+++ b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
@@ -35,7 +35,7 @@
 #                         empty
 #
 
-macro(DEAL_II_INVOKE_AUTOPILOT)
+macro(deal_ii_invoke_autopilot)
 
   # Generator specific values:
   if(CMAKE_GENERATOR MATCHES "Ninja")
diff --git a/cmake/macros/macro_deal_ii_package_handle.cmake b/cmake/macros/macro_deal_ii_package_handle.cmake
index bef44babc5..79b86e0f66 100644
--- a/cmake/macros/macro_deal_ii_package_handle.cmake
+++ b/cmake/macros/macro_deal_ii_package_handle.cmake
@@ -45,7 +45,7 @@
 # search.
 #
 
-macro(DEAL_II_PACKAGE_HANDLE _feature)
+macro(deal_ii_package_handle _feature)
 
   if(DEFINED ${_feature}_VERSION)
     message(STATUS "  ${_feature}_VERSION: ${${_feature}_VERSION}")
diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake
index 5815f2fa6f..d70f926194 100644
--- a/cmake/macros/macro_deal_ii_pickup_tests.cmake
+++ b/cmake/macros/macro_deal_ii_pickup_tests.cmake
@@ -77,13 +77,13 @@
 # Two very small macros that are used below:
 #
 
-macro(SET_IF_EMPTY _variable)
+macro(set_if_empty _variable)
   if("${${_variable}}" STREQUAL "")
     set(${_variable} ${ARGN})
   endif()
 endmacro()
 
-macro(ITEM_MATCHES _var _regex)
+macro(item_matches _var _regex)
   set(${_var})
   foreach (_item ${ARGN})
     if("${_item}" MATCHES ${_regex})
@@ -94,7 +94,7 @@ macro(ITEM_MATCHES _var _regex)
 endmacro()
 
 
-macro(DEAL_II_PICKUP_TESTS)
+macro(deal_ii_pickup_tests)
 
   if(NOT DEAL_II_PROJECT_CONFIG_INCLUDED)
     message(FATAL_ERROR
diff --git a/cmake/macros/macro_deal_ii_query_git_information.cmake b/cmake/macros/macro_deal_ii_query_git_information.cmake
index 11139e602b..390c1f9cc5 100644
--- a/cmake/macros/macro_deal_ii_query_git_information.cmake
+++ b/cmake/macros/macro_deal_ii_query_git_information.cmake
@@ -40,7 +40,7 @@
 #       PREFIX_GIT_TIMESTAMP
 #
 
-macro(DEAL_II_QUERY_GIT_INFORMATION)
+macro(deal_ii_query_git_information)
 
   message(STATUS "Query git repository information.")
 
diff --git a/cmake/macros/macro_deal_ii_setup_target.cmake b/cmake/macros/macro_deal_ii_setup_target.cmake
index 90a59ad6f6..89d4014e3e 100644
--- a/cmake/macros/macro_deal_ii_setup_target.cmake
+++ b/cmake/macros/macro_deal_ii_setup_target.cmake
@@ -50,7 +50,7 @@
 # FATAL_ERROR.
 #
 
-macro(DEAL_II_SETUP_TARGET _target)
+macro(deal_ii_setup_target _target)
 
   if(NOT DEAL_II_PROJECT_CONFIG_INCLUDED)
     message(FATAL_ERROR
diff --git a/cmake/macros/macro_decorate_with_stars.cmake b/cmake/macros/macro_decorate_with_stars.cmake
index 11ff62a1bb..730d774f94 100644
--- a/cmake/macros/macro_decorate_with_stars.cmake
+++ b/cmake/macros/macro_decorate_with_stars.cmake
@@ -30,7 +30,7 @@
 #     decorate_with_stars(message decorated_message)
 #
 #
-macro(DECORATE_WITH_STARS _message _decorated_message)
+macro(decorate_with_stars _message _decorated_message)
   string(LENGTH ${_message} _message_length)
   set(_line_length 75)
   math(EXPR _unpadded_line_length "${_line_length} - 6")
diff --git a/cmake/macros/macro_enable_if_links.cmake b/cmake/macros/macro_enable_if_links.cmake
index 071592dba5..19f7963def 100644
--- a/cmake/macros/macro_enable_if_links.cmake
+++ b/cmake/macros/macro_enable_if_links.cmake
@@ -22,7 +22,7 @@
 #     enable_if_links(variable flag)
 #
 
-macro(ENABLE_IF_LINKS _variable _flag)
+macro(enable_if_links _variable _flag)
   # keep on top to avoid cluttering the _flag and _flag_stripped variables
   enable_if_supported(CMAKE_REQUIRED_FLAGS "-Werror")
 
diff --git a/cmake/macros/macro_enable_if_supported.cmake b/cmake/macros/macro_enable_if_supported.cmake
index 964f6d5e80..69ae6c4ada 100644
--- a/cmake/macros/macro_enable_if_supported.cmake
+++ b/cmake/macros/macro_enable_if_supported.cmake
@@ -21,7 +21,7 @@
 #     enable_if_supported(variable flag)
 #
 
-macro(ENABLE_IF_SUPPORTED _variable _flag)
+macro(enable_if_supported _variable _flag)
   string(STRIP "${_flag}" _flag_stripped)
 
   #
diff --git a/cmake/macros/macro_enable_language_optional.cmake b/cmake/macros/macro_enable_language_optional.cmake
index ec7ee5aed3..f5831cddd4 100644
--- a/cmake/macros/macro_enable_language_optional.cmake
+++ b/cmake/macros/macro_enable_language_optional.cmake
@@ -30,7 +30,7 @@
 # where language is either C or Fortran
 #
 
-macro(ENABLE_LANGUAGE_OPTIONAL _language)
+macro(enable_language_optional _language)
   if(NOT ${_language}_CHECKED)
     #
     # Run this check exactly once:
diff --git a/cmake/macros/macro_evaluate_expression.cmake b/cmake/macros/macro_evaluate_expression.cmake
index d4fa59537f..34ff609275 100644
--- a/cmake/macros/macro_evaluate_expression.cmake
+++ b/cmake/macros/macro_evaluate_expression.cmake
@@ -22,7 +22,7 @@
 # evaluate_expression("<expression>")
 #
 
-macro(EVALUATE_EXPRESSION _the_expression)
+macro(evaluate_expression _the_expression)
   set(_tmp_name
     "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/evaluate_expression.tmp"
     )
diff --git a/cmake/macros/macro_expand_instantiations.cmake b/cmake/macros/macro_expand_instantiations.cmake
index ff23726ffa..e8500fc3a5 100644
--- a/cmake/macros/macro_expand_instantiations.cmake
+++ b/cmake/macros/macro_expand_instantiations.cmake
@@ -32,7 +32,7 @@
 #    a list of inst.in files that will be expanded
 #
 
-macro(EXPAND_INSTANTIATIONS _target _inst_in_files)
+macro(expand_instantiations _target _inst_in_files)
 
   foreach (_inst_in_file ${_inst_in_files})
     string(REGEX REPLACE "\\.in$" "" _inst_file "${_inst_in_file}" )
diff --git a/cmake/macros/macro_filter_system_libraries.cmake b/cmake/macros/macro_filter_system_libraries.cmake
index 753eddcb06..409f41ad3b 100644
--- a/cmake/macros/macro_filter_system_libraries.cmake
+++ b/cmake/macros/macro_filter_system_libraries.cmake
@@ -22,7 +22,7 @@
 #     filter_system_libraries(feature)
 #
 
-macro(FILTER_SYSTEM_LIBRARIES _feature)
+macro(filter_system_libraries _feature)
   foreach(_variable
     ${_feature}_LIBRARIES
     ${_feature}_LIBRARIES_DEBUG
diff --git a/cmake/macros/macro_find_system_library.cmake b/cmake/macros/macro_find_system_library.cmake
index 155f189dd0..242cf4af34 100644
--- a/cmake/macros/macro_find_system_library.cmake
+++ b/cmake/macros/macro_find_system_library.cmake
@@ -21,7 +21,7 @@
 #   find_system_library(variable NAMES [list of possible names])
 #
 
-macro(FIND_SYSTEM_LIBRARY)
+macro(find_system_library)
   set(_argn ${ARGN})
   list(GET _argn 0 _variable)
   list(REMOVE_AT _argn 0 1)
diff --git a/cmake/macros/macro_item_matches.cmake b/cmake/macros/macro_item_matches.cmake
index 5b92cc5062..a319d1883b 100644
--- a/cmake/macros/macro_item_matches.cmake
+++ b/cmake/macros/macro_item_matches.cmake
@@ -22,7 +22,7 @@
 # var is set to true if list contains an item that matches regex.
 #
 
-macro(ITEM_MATCHES _var _regex)
+macro(item_matches _var _regex)
   set(${_var})
   foreach (_item ${ARGN})
     if("${_item}" MATCHES ${_regex})
diff --git a/cmake/macros/macro_purge_feature.cmake b/cmake/macros/macro_purge_feature.cmake
index 7bc04df881..8f79ee23b3 100644
--- a/cmake/macros/macro_purge_feature.cmake
+++ b/cmake/macros/macro_purge_feature.cmake
@@ -20,7 +20,7 @@
 #     purge_feature(feature)
 #
 
-macro(PURGE_FEATURE _feature)
+macro(purge_feature _feature)
   #
   # uncached:
   #
diff --git a/cmake/macros/macro_register_feature.cmake b/cmake/macros/macro_register_feature.cmake
index f42d00eda2..71bf4c03d4 100644
--- a/cmake/macros/macro_register_feature.cmake
+++ b/cmake/macros/macro_register_feature.cmake
@@ -29,7 +29,7 @@
 # DEAL_II_STRING_SUFFIXES to the corresponding DEAL_II_* variables
 #
 
-macro(REGISTER_FEATURE _feature)
+macro(register_feature _feature)
 
   if(DEFINED ${_feature}_LIBRARIES)
     #
diff --git a/cmake/macros/macro_remove_duplicates.cmake b/cmake/macros/macro_remove_duplicates.cmake
index 096ffe1b33..a718798d38 100644
--- a/cmake/macros/macro_remove_duplicates.cmake
+++ b/cmake/macros/macro_remove_duplicates.cmake
@@ -21,7 +21,7 @@
 #     remove_duplicates(list [REVERSE])
 #
 
-macro(REMOVE_DUPLICATES _list)
+macro(remove_duplicates _list)
   if(NOT "${${_list}}" STREQUAL "")
     if("${ARGN}" STREQUAL "REVERSE")
       list(REVERSE ${_list})
diff --git a/cmake/macros/macro_replace_flag.cmake b/cmake/macros/macro_replace_flag.cmake
index 9157c0f602..eab61969ce 100644
--- a/cmake/macros/macro_replace_flag.cmake
+++ b/cmake/macros/macro_replace_flag.cmake
@@ -21,7 +21,7 @@
 #     replace_flag(variable flag replacement)
 #
 
-macro(REPLACE_FLAG _variable _flag _replacement)
+macro(replace_flag _variable _flag _replacement)
   string(STRIP "${_replacement}" _replacement_stripped)
   string(REPLACE " " "  " ${_variable} "${${_variable}}")
   set(${_variable} " ${${_variable}} ")
diff --git a/cmake/macros/macro_reset_cmake_required.cmake b/cmake/macros/macro_reset_cmake_required.cmake
index de98a049c0..827ffc6992 100644
--- a/cmake/macros/macro_reset_cmake_required.cmake
+++ b/cmake/macros/macro_reset_cmake_required.cmake
@@ -21,7 +21,7 @@
 #     RESET_CMAKE_REQUIRED_FLAGS
 #
 
-macro(RESET_CMAKE_REQUIRED)
+macro(reset_cmake_required)
   set(CMAKE_REQUIRED_FLAGS ${DEAL_II_CXX_FLAGS_SAVED})
   set(CMAKE_REQUIRED_INCLUDES)
   set(CMAKE_REQUIRED_LIBRARIES ${DEAL_II_LINKER_FLAGS_SAVED})
diff --git a/cmake/macros/macro_set_if_empty.cmake b/cmake/macros/macro_set_if_empty.cmake
index 4e537267bd..dcaee263d6 100644
--- a/cmake/macros/macro_set_if_empty.cmake
+++ b/cmake/macros/macro_set_if_empty.cmake
@@ -16,7 +16,7 @@
 #
 # If 'variable' is empty it will be set to 'value'
 #
-macro(SET_IF_EMPTY _variable)
+macro(set_if_empty _variable)
   if("${${_variable}}" STREQUAL "")
     set(${_variable} ${ARGN})
   endif()
diff --git a/cmake/macros/macro_setup_source_list.cmake b/cmake/macros/macro_setup_source_list.cmake
index df4ad1862d..a3d4206edb 100644
--- a/cmake/macros/macro_setup_source_list.cmake
+++ b/cmake/macros/macro_setup_source_list.cmake
@@ -25,7 +25,7 @@
 # otherwise, if DEAL_II_UNITY_BUILD=OFF, then all source files are added to the
 # variable _source_files.
 #
-macro(SETUP_SOURCE_LIST _unity_include_src _separate_src _n_includes_per_unity_file _output_src)
+macro(setup_source_list _unity_include_src _separate_src _n_includes_per_unity_file _output_src)
   if(DEAL_II_UNITY_BUILD)
     setup_unity_target("${_unity_include_src}" ${_n_includes_per_unity_file} ${_output_src})
     set(${_output_src}
diff --git a/cmake/macros/macro_setup_unity_target.cmake b/cmake/macros/macro_setup_unity_target.cmake
index debf37c99f..3ec42ff90a 100644
--- a/cmake/macros/macro_setup_unity_target.cmake
+++ b/cmake/macros/macro_setup_unity_target.cmake
@@ -21,7 +21,7 @@
 # and the number of files to be included per unity file. It generates the unity
 # build files and appends their names to _output_src.
 #
-macro(SETUP_UNITY_TARGET _unity_include_src _n_includes_per_unity_file _output_src)
+macro(setup_unity_target _unity_include_src _n_includes_per_unity_file _output_src)
   #
   # The unity build files need access to the original source files:
   #
diff --git a/cmake/macros/macro_strip_flag.cmake b/cmake/macros/macro_strip_flag.cmake
index 92b1681558..529143657f 100644
--- a/cmake/macros/macro_strip_flag.cmake
+++ b/cmake/macros/macro_strip_flag.cmake
@@ -20,7 +20,7 @@
 #     strip_flag(variable flag)
 #
 
-macro(STRIP_FLAG _variable _flag)
+macro(strip_flag _variable _flag)
   string(REPLACE " " "  " ${_variable} "${${_variable}}")
   set(${_variable} " ${${_variable}} ")
   string(REPLACE " " "  " _flag2 "${_flag}")
diff --git a/cmake/macros/macro_switch_library_preference.cmake b/cmake/macros/macro_switch_library_preference.cmake
index 2bd666d419..9b2dbe9551 100644
--- a/cmake/macros/macro_switch_library_preference.cmake
+++ b/cmake/macros/macro_switch_library_preference.cmake
@@ -22,7 +22,7 @@
 #     switch_library_preference()
 #
 
-macro(SWITCH_LIBRARY_PREFERENCE)
+macro(switch_library_preference)
   if(DEAL_II_PREFER_STATIC_LIBS AND NOT DEAL_II_STATIC_EXECUTABLE)
     #
     # Invert the search order for libraries when DEAL_II_PREFER_STATIC_LIBS
diff --git a/cmake/macros/macro_to_string.cmake b/cmake/macros/macro_to_string.cmake
index 2811301454..13e51158bd 100644
--- a/cmake/macros/macro_to_string.cmake
+++ b/cmake/macros/macro_to_string.cmake
@@ -21,7 +21,7 @@
 #     to_string(string ${list1} ${list2} ...)
 #
 
-macro(TO_STRING _variable)
+macro(to_string _variable)
   set(${_variable} "")
   foreach(_var  ${ARGN})
     set(${_variable} "${${_variable}} ${_var}")
diff --git a/cmake/macros/macro_to_string_and_add_prefix.cmake b/cmake/macros/macro_to_string_and_add_prefix.cmake
index bf50fad21c..bc2227e103 100644
--- a/cmake/macros/macro_to_string_and_add_prefix.cmake
+++ b/cmake/macros/macro_to_string_and_add_prefix.cmake
@@ -22,7 +22,7 @@
 #     to_string_and_add_prefix(string "prefix" ${list1} ${list2} ...)
 #
 
-macro(TO_STRING_AND_ADD_PREFIX _variable _prefix)
+macro(to_string_and_add_prefix _variable _prefix)
   set(${_variable} "")
   foreach(_var ${ARGN})
     set(${_variable} "${${_variable}} ${_prefix}${_var}")
diff --git a/cmake/macros/macro_unset_if_changed.cmake b/cmake/macros/macro_unset_if_changed.cmake
index 06dd893887..23fe6cede3 100644
--- a/cmake/macros/macro_unset_if_changed.cmake
+++ b/cmake/macros/macro_unset_if_changed.cmake
@@ -23,7 +23,7 @@
 # variable>} and unsets all supplied (cached) variables if this string
 # changes.
 #
-macro(UNSET_IF_CHANGED _variable _string)
+macro(unset_if_changed _variable _string)
   if(DEFINED ${_variable})
     if(NOT "${${_variable}}" STREQUAL "${_string}")
       foreach(_arg ${ARGN})
diff --git a/cmake/macros/macro_verbose_include.cmake b/cmake/macros/macro_verbose_include.cmake
index a047cd650b..9e2142d2fd 100644
--- a/cmake/macros/macro_verbose_include.cmake
+++ b/cmake/macros/macro_verbose_include.cmake
@@ -13,7 +13,7 @@
 ##
 ## ---------------------------------------------------------------------
 
-macro(VERBOSE_INCLUDE _file)
+macro(verbose_include _file)
   message(STATUS "")
   message(STATUS "Include ${_file}")
   include(${_file})
diff --git a/cmake/modules/FindDEAL_II_UMFPACK.cmake b/cmake/modules/FindDEAL_II_UMFPACK.cmake
index 8b090b3657..00b0f26932 100644
--- a/cmake/modules/FindDEAL_II_UMFPACK.cmake
+++ b/cmake/modules/FindDEAL_II_UMFPACK.cmake
@@ -39,7 +39,7 @@ endforeach()
 # Two macros to make life easier:
 #
 
-macro(FIND_UMFPACK_PATH _comp _file)
+macro(find_umfpack_path _comp _file)
   string(TOLOWER ${_comp} _comp_lowercase)
   string(TOUPPER ${_comp} _comp_uppercase)
   deal_ii_find_path(${_comp}_INCLUDE_DIR ${_file}
@@ -54,7 +54,7 @@ macro(FIND_UMFPACK_PATH _comp _file)
     )
 endmacro()
 
-macro(FIND_UMFPACK_LIBRARY _comp _name)
+macro(find_umfpack_library _comp _name)
   string(TOUPPER ${_comp} _comp_uppercase)
   deal_ii_find_library(${_comp}_LIBRARY
     NAMES ${_name} lib${_name}
diff --git a/cmake/setup_compiler_flags.cmake b/cmake/setup_compiler_flags.cmake
index cea8408760..4f9a8e762b 100644
--- a/cmake/setup_compiler_flags.cmake
+++ b/cmake/setup_compiler_flags.cmake
@@ -135,10 +135,10 @@ if(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS)
       )
   endif()
 
-else(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS)
+else()
 
   message(STATUS
     "Skipped setup of default compiler flags "
     "(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS=OFF)"
     )
-endif(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS)
+endif()
diff --git a/contrib/python-bindings/CMakeLists.txt b/contrib/python-bindings/CMakeLists.txt
index f13894b6b4..eb2935983f 100644
--- a/contrib/python-bindings/CMakeLists.txt
+++ b/contrib/python-bindings/CMakeLists.txt
@@ -96,4 +96,4 @@ if(DEAL_II_COMPONENT_PYTHON_BINDINGS)
   message(STATUS "Setting up python bindings - Done")
   message(STATUS "")
 
-endif(DEAL_II_COMPONENT_PYTHON_BINDINGS)
+endif()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 3a80c5f706..0e037ef365 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -38,7 +38,7 @@ if(DEAL_II_COMPONENT_DOCUMENTATION)
   message(STATUS "Setting up documentation - Done")
   message(STATUS "")
 
-endif(DEAL_II_COMPONENT_DOCUMENTATION)
+endif()
 
 #
 # Always install a minimalistic README and LICENSE file:
diff --git a/doc/news/CMakeLists.txt b/doc/news/CMakeLists.txt
index 9a71a62082..cb9b6a4ea2 100644
--- a/doc/news/CMakeLists.txt
+++ b/doc/news/CMakeLists.txt
@@ -47,4 +47,4 @@ if(DEAL_II_COMPONENT_DOCUMENTATION)
 
   add_dependencies(documentation changelog)
 
-endif(DEAL_II_COMPONENT_DOCUMENTATION)
+endif()
diff --git a/doc/news/changes/create_changes_h.cmake b/doc/news/changes/create_changes_h.cmake
index 7d70ff0d79..b36d54a762 100644
--- a/doc/news/changes/create_changes_h.cmake
+++ b/doc/news/changes/create_changes_h.cmake
@@ -14,7 +14,7 @@
 ## ---------------------------------------------------------------------
 
 # Auxiliary functions
-function(CAT IN_FILE OUT_FILE INDENT)
+function(cat IN_FILE OUT_FILE INDENT)
   file(READ ${IN_FILE} CONTENTS)
   if(${INDENT} MATCHES "TRUE")
     file(STRINGS ${IN_FILE} LINESTMP)
@@ -26,7 +26,7 @@ function(CAT IN_FILE OUT_FILE INDENT)
   endif()
 endfunction()
 
-function(PROCESS IN_DIR OUT_FILE)
+function(process IN_DIR OUT_FILE)
   file(APPEND ${OUT_FILE} "<ol>\n")
   file(GLOB ENTRY_LIST ${IN_DIR}/[0-9]*)
   list(SORT ENTRY_LIST)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9484516605..ca5603ea99 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 cmake_minimum_required(VERSION 3.3.0)
 
-macro(SET_IF_EMPTY _variable)
+macro(set_if_empty _variable)
   if("${${_variable}}" STREQUAL "")
     set(${_variable} ${ARGN})
   endif()
diff --git a/tests/run_performance_tests.cmake b/tests/run_performance_tests.cmake
index 39a53c7810..3fba17c6c8 100644
--- a/tests/run_performance_tests.cmake
+++ b/tests/run_performance_tests.cmake
@@ -1,5 +1,5 @@
 # A small macro
-macro(SET_IF_EMPTY _variable)
+macro(set_if_empty _variable)
   if("${${_variable}}" STREQUAL "")
     set(${_variable} ${ARGN})
   endif()
diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake
index 3bf2b5b0c0..dc4d6ea6f0 100644
--- a/tests/run_testsuite.cmake
+++ b/tests/run_testsuite.cmake
@@ -465,7 +465,7 @@ message("-- MEMORYCHECK:               ${MEMORYCHECK}")
 
 
 
-macro(CREATE_TARGETDIRECTORIES_TXT)
+macro(create_targetdirectories_txt)
   #
   # It gets tricky: Fake a TargetDirectories.txt containing _all_ target
   # directories (of the main project and all subprojects) so that the
@@ -484,7 +484,7 @@ macro(CREATE_TARGETDIRECTORIES_TXT)
   endforeach()
 endmacro()
 
-macro(CLEAR_TARGETDIRECTORIES_TXT)
+macro(clear_targetdirectories_txt)
   execute_process(COMMAND ${CMAKE_COMMAND} -E rename
     ${CTEST_BINARY_DIRECTORY}/CMakeFiles/TargetDirectories.txt.bck
     ${CTEST_BINARY_DIRECTORY}/CMakeFiles/TargetDirectories.txt
@@ -569,7 +569,7 @@ if("${_res}" STREQUAL "0")
     else()
       message("-- Running CTEST_TESTS()")
       ctest_test()
-    endif(MEMORYCHECK)
+    endif()
 
     if(COVERAGE)
       CREATE_TARGETDIRECTORIES_TXT()
@@ -583,7 +583,7 @@ if("${_res}" STREQUAL "0")
                         OUTPUT_QUIET)
       endif()
       CLEAR_TARGETDIRECTORIES_TXT()
-    endif(COVERAGE)
+    endif()
 
   endif()
 endif()