From: Matthias Maier Date: Wed, 25 May 2022 21:40:45 +0000 (-0500) Subject: CMake: Make configure file naming consistent X-Git-Tag: v9.4.0-rc1~135^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58998a229a388e8579b880a5dc6b4688dade1aa6;p=dealii.git CMake: Make configure file naming consistent Configure file are including and processed in alphabetical order. However, in order to allow for feature dependencies we have to include some configure files before others. We have solved this by numbering some of the configure files in order to force them to be processed before others. This pull requests makes this numbering a bit more consistent by - numbering _all_ of the configure files with a default number of 50, and configure files that have to be processed earlier taking up a number between 40 and 00. - increasing the numbering from one digit to two digits to accomodate a possible future need to adjust the inclusion order a bit better. --- diff --git a/cmake/configure/configure_0_threads.cmake b/cmake/configure/configure_00_threads.cmake similarity index 100% rename from cmake/configure/configure_0_threads.cmake rename to cmake/configure/configure_00_threads.cmake diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_10_cuda.cmake similarity index 100% rename from cmake/configure/configure_1_cuda.cmake rename to cmake/configure/configure_10_cuda.cmake diff --git a/cmake/configure/configure_1_lapack.cmake b/cmake/configure/configure_10_lapack.cmake similarity index 100% rename from cmake/configure/configure_1_lapack.cmake rename to cmake/configure/configure_10_lapack.cmake diff --git a/cmake/configure/configure_1_mpi.cmake b/cmake/configure/configure_10_mpi.cmake similarity index 100% rename from cmake/configure/configure_1_mpi.cmake rename to cmake/configure/configure_10_mpi.cmake diff --git a/cmake/configure/configure_1_taskflow.cmake b/cmake/configure/configure_10_taskflow.cmake similarity index 100% rename from cmake/configure/configure_1_taskflow.cmake rename to cmake/configure/configure_10_taskflow.cmake diff --git a/cmake/configure/configure_1_tbb.cmake b/cmake/configure/configure_10_tbb.cmake similarity index 100% rename from cmake/configure/configure_1_tbb.cmake rename to cmake/configure/configure_10_tbb.cmake diff --git a/cmake/configure/configure_1_zlib.cmake b/cmake/configure/configure_10_zlib.cmake similarity index 100% rename from cmake/configure/configure_1_zlib.cmake rename to cmake/configure/configure_10_zlib.cmake diff --git a/cmake/configure/configure_2_boost.cmake b/cmake/configure/configure_20_boost.cmake similarity index 100% rename from cmake/configure/configure_2_boost.cmake rename to cmake/configure/configure_20_boost.cmake diff --git a/cmake/configure/configure_2_ginkgo.cmake b/cmake/configure/configure_20_ginkgo.cmake similarity index 100% rename from cmake/configure/configure_2_ginkgo.cmake rename to cmake/configure/configure_20_ginkgo.cmake diff --git a/cmake/configure/configure_2_metis.cmake b/cmake/configure/configure_20_metis.cmake similarity index 100% rename from cmake/configure/configure_2_metis.cmake rename to cmake/configure/configure_20_metis.cmake diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_20_trilinos.cmake similarity index 100% rename from cmake/configure/configure_2_trilinos.cmake rename to cmake/configure/configure_20_trilinos.cmake diff --git a/cmake/configure/configure_2_umfpack.cmake b/cmake/configure/configure_20_umfpack.cmake similarity index 100% rename from cmake/configure/configure_2_umfpack.cmake rename to cmake/configure/configure_20_umfpack.cmake diff --git a/cmake/configure/configure_3_kokkos.cmake b/cmake/configure/configure_30_kokkos.cmake similarity index 100% rename from cmake/configure/configure_3_kokkos.cmake rename to cmake/configure/configure_30_kokkos.cmake diff --git a/cmake/configure/configure_3_petsc.cmake b/cmake/configure/configure_30_petsc.cmake similarity index 100% rename from cmake/configure/configure_3_petsc.cmake rename to cmake/configure/configure_30_petsc.cmake diff --git a/cmake/configure/configure_adolc.cmake b/cmake/configure/configure_50_adolc.cmake similarity index 100% rename from cmake/configure/configure_adolc.cmake rename to cmake/configure/configure_50_adolc.cmake diff --git a/cmake/configure/configure_4_arborx.cmake b/cmake/configure/configure_50_arborx.cmake similarity index 100% rename from cmake/configure/configure_4_arborx.cmake rename to cmake/configure/configure_50_arborx.cmake diff --git a/cmake/configure/configure_arpack.cmake b/cmake/configure/configure_50_arpack.cmake similarity index 100% rename from cmake/configure/configure_arpack.cmake rename to cmake/configure/configure_50_arpack.cmake diff --git a/cmake/configure/configure_assimp.cmake b/cmake/configure/configure_50_assimp.cmake similarity index 100% rename from cmake/configure/configure_assimp.cmake rename to cmake/configure/configure_50_assimp.cmake diff --git a/cmake/configure/configure_cgal.cmake b/cmake/configure/configure_50_cgal.cmake similarity index 100% rename from cmake/configure/configure_cgal.cmake rename to cmake/configure/configure_50_cgal.cmake diff --git a/cmake/configure/configure_complex_values.cmake b/cmake/configure/configure_50_complex_values.cmake similarity index 100% rename from cmake/configure/configure_complex_values.cmake rename to cmake/configure/configure_50_complex_values.cmake diff --git a/cmake/configure/configure_gmsh.cmake b/cmake/configure/configure_50_gmsh.cmake similarity index 100% rename from cmake/configure/configure_gmsh.cmake rename to cmake/configure/configure_50_gmsh.cmake diff --git a/cmake/configure/configure_gsl.cmake b/cmake/configure/configure_50_gsl.cmake similarity index 100% rename from cmake/configure/configure_gsl.cmake rename to cmake/configure/configure_50_gsl.cmake diff --git a/cmake/configure/configure_hdf5.cmake b/cmake/configure/configure_50_hdf5.cmake similarity index 100% rename from cmake/configure/configure_hdf5.cmake rename to cmake/configure/configure_50_hdf5.cmake diff --git a/cmake/configure/configure_muparser.cmake b/cmake/configure/configure_50_muparser.cmake similarity index 100% rename from cmake/configure/configure_muparser.cmake rename to cmake/configure/configure_50_muparser.cmake diff --git a/cmake/configure/configure_opencascade.cmake b/cmake/configure/configure_50_opencascade.cmake similarity index 100% rename from cmake/configure/configure_opencascade.cmake rename to cmake/configure/configure_50_opencascade.cmake diff --git a/cmake/configure/configure_p4est.cmake b/cmake/configure/configure_50_p4est.cmake similarity index 100% rename from cmake/configure/configure_p4est.cmake rename to cmake/configure/configure_50_p4est.cmake diff --git a/cmake/configure/configure_scalapack.cmake b/cmake/configure/configure_50_scalapack.cmake similarity index 100% rename from cmake/configure/configure_scalapack.cmake rename to cmake/configure/configure_50_scalapack.cmake diff --git a/cmake/configure/configure_slepc.cmake b/cmake/configure/configure_50_slepc.cmake similarity index 100% rename from cmake/configure/configure_slepc.cmake rename to cmake/configure/configure_50_slepc.cmake diff --git a/cmake/configure/configure_sundials.cmake b/cmake/configure/configure_50_sundials.cmake similarity index 100% rename from cmake/configure/configure_sundials.cmake rename to cmake/configure/configure_50_sundials.cmake diff --git a/cmake/configure/configure_symengine.cmake b/cmake/configure/configure_50_symengine.cmake similarity index 100% rename from cmake/configure/configure_symengine.cmake rename to cmake/configure/configure_50_symengine.cmake diff --git a/cmake/configure/configure_vectorization.cmake b/cmake/configure/configure_50_vectorization.cmake similarity index 100% rename from cmake/configure/configure_vectorization.cmake rename to cmake/configure/configure_50_vectorization.cmake