From d94d6077e68a9965b83a42dbcd2be32bd431bd96 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 25 Nov 2022 07:20:18 -0600 Subject: [PATCH] CMake: Update configure macros to use DEAL_II_* feature names --- cmake/configure/configure_10_lapack.cmake | 2 +- cmake/configure/configure_10_mpi.cmake | 2 +- cmake/configure/configure_10_taskflow.cmake | 2 +- cmake/configure/configure_10_tbb.cmake | 2 +- cmake/configure/configure_20_boost.cmake | 2 +- cmake/configure/configure_20_ginkgo.cmake | 2 +- cmake/configure/configure_20_metis.cmake | 2 +- cmake/configure/configure_20_trilinos.cmake | 2 +- cmake/configure/configure_30_petsc.cmake | 2 +- cmake/configure/configure_40_cuda.cmake | 2 +- cmake/configure/configure_50_adolc.cmake | 2 +- cmake/configure/configure_50_cgal.cmake | 2 +- cmake/configure/configure_50_hdf5.cmake | 2 +- cmake/configure/configure_50_p4est.cmake | 2 +- cmake/configure/configure_50_scalapack.cmake | 2 +- cmake/configure/configure_50_slepc.cmake | 2 +- cmake/configure/configure_50_sundials.cmake | 2 +- cmake/configure/configure_50_symengine.cmake | 2 +- cmake/macros/macro_configure_feature.cmake | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmake/configure/configure_10_lapack.cmake b/cmake/configure/configure_10_lapack.cmake index 48c7063c70..13e3a1a063 100644 --- a/cmake/configure/configure_10_lapack.cmake +++ b/cmake/configure/configure_10_lapack.cmake @@ -19,7 +19,7 @@ macro(FEATURE_LAPACK_FIND_EXTERNAL var) clear_cmake_required() - find_package(LAPACK) + find_package(DEAL_II_LAPACK) # # We do a check for availability of every single LAPACK function we use. diff --git a/cmake/configure/configure_10_mpi.cmake b/cmake/configure/configure_10_mpi.cmake index 3f617266b7..83473dc04c 100644 --- a/cmake/configure/configure_10_mpi.cmake +++ b/cmake/configure/configure_10_mpi.cmake @@ -25,7 +25,7 @@ set(DEAL_II_WITH_MPI OFF CACHE BOOL "") # macro(FEATURE_MPI_FIND_EXTERNAL var) - find_package(MPI) + find_package(DEAL_II_MPI) if(MPI_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_10_taskflow.cmake b/cmake/configure/configure_10_taskflow.cmake index 9562900a86..6696d8304f 100644 --- a/cmake/configure/configure_10_taskflow.cmake +++ b/cmake/configure/configure_10_taskflow.cmake @@ -25,7 +25,7 @@ set(DEAL_II_WITH_TASKFLOW OFF CACHE BOOL "") macro(FEATURE_TASKFLOW_FIND_EXTERNAL var) - find_package(TASKFLOW) + find_package(DEAL_II_TASKFLOW) if(TASKFLOW_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_10_tbb.cmake b/cmake/configure/configure_10_tbb.cmake index ac8cc8cfc7..baefb65ed4 100644 --- a/cmake/configure/configure_10_tbb.cmake +++ b/cmake/configure/configure_10_tbb.cmake @@ -19,7 +19,7 @@ # macro(FEATURE_TBB_FIND_EXTERNAL var) - find_package(TBB) + find_package(DEAL_II_TBB) if(TBB_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_20_boost.cmake b/cmake/configure/configure_20_boost.cmake index d4b9df4dff..738aaeab99 100644 --- a/cmake/configure/configure_20_boost.cmake +++ b/cmake/configure/configure_20_boost.cmake @@ -143,7 +143,7 @@ macro(FEATURE_BOOST_CONFIGURE_BUNDLED) endmacro() macro(FEATURE_BOOST_FIND_EXTERNAL var) - find_package(BOOST) + find_package(DEAL_II_BOOST) if(BOOST_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_20_ginkgo.cmake b/cmake/configure/configure_20_ginkgo.cmake index c4b823362b..d876dc6b82 100644 --- a/cmake/configure/configure_20_ginkgo.cmake +++ b/cmake/configure/configure_20_ginkgo.cmake @@ -18,7 +18,7 @@ # macro(FEATURE_GINKGO_FIND_EXTERNAL var) - find_package(GINKGO) + find_package(DEAL_II_GINKGO) if(GINKGO_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_20_metis.cmake b/cmake/configure/configure_20_metis.cmake index abea148b0d..032a4ce642 100644 --- a/cmake/configure/configure_20_metis.cmake +++ b/cmake/configure/configure_20_metis.cmake @@ -20,7 +20,7 @@ set(FEATURE_METIS_AFTER MPI) # macro(FEATURE_METIS_FIND_EXTERNAL var) - find_package(METIS) + find_package(DEAL_II_METIS) if(METIS_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_20_trilinos.cmake b/cmake/configure/configure_20_trilinos.cmake index 01573fa071..e8a235bfa7 100644 --- a/cmake/configure/configure_20_trilinos.cmake +++ b/cmake/configure/configure_20_trilinos.cmake @@ -20,7 +20,7 @@ set(FEATURE_TRILINOS_DEPENDS MPI) macro(FEATURE_TRILINOS_FIND_EXTERNAL var) - find_package(TRILINOS) + find_package(DEAL_II_TRILINOS) if(TRILINOS_FOUND) # diff --git a/cmake/configure/configure_30_petsc.cmake b/cmake/configure/configure_30_petsc.cmake index f8a85e0e47..8bb5dd695b 100644 --- a/cmake/configure/configure_30_petsc.cmake +++ b/cmake/configure/configure_30_petsc.cmake @@ -21,7 +21,7 @@ set(FEATURE_PETSC_AFTER MPI) macro(FEATURE_PETSC_FIND_EXTERNAL var) - find_package(PETSC) + find_package(DEAL_II_PETSC) if(PETSC_FOUND) # diff --git a/cmake/configure/configure_40_cuda.cmake b/cmake/configure/configure_40_cuda.cmake index 1e2f14f8c2..4752c47601 100644 --- a/cmake/configure/configure_40_cuda.cmake +++ b/cmake/configure/configure_40_cuda.cmake @@ -44,7 +44,7 @@ macro(FEATURE_CUDA_FIND_EXTERNAL var) # still use it because it is very convenient to (a) check that CUDA is # installed, (b) get compiler path and include directories / libraries. # - find_package(CUDA) + find_package(DEAL_II_CUDA) if(CUDA_FOUND) # diff --git a/cmake/configure/configure_50_adolc.cmake b/cmake/configure/configure_50_adolc.cmake index a958fae298..248ea43ebc 100644 --- a/cmake/configure/configure_50_adolc.cmake +++ b/cmake/configure/configure_50_adolc.cmake @@ -20,7 +20,7 @@ set(FEATURE_ADOLC_AFTER BOOST TRILINOS) macro(FEATURE_ADOLC_FIND_EXTERNAL var) - find_package(ADOLC) + find_package(DEAL_II_ADOLC) if(ADOLC_FOUND) # diff --git a/cmake/configure/configure_50_cgal.cmake b/cmake/configure/configure_50_cgal.cmake index bfabcdb0d2..eecc717e7f 100644 --- a/cmake/configure/configure_50_cgal.cmake +++ b/cmake/configure/configure_50_cgal.cmake @@ -28,7 +28,7 @@ endif() macro(FEATURE_CGAL_FIND_EXTERNAL var) - find_package(CGAL) + find_package(DEAL_II_CGAL) if(CGAL_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_50_hdf5.cmake b/cmake/configure/configure_50_hdf5.cmake index e4475a661d..78a70da1d4 100644 --- a/cmake/configure/configure_50_hdf5.cmake +++ b/cmake/configure/configure_50_hdf5.cmake @@ -20,7 +20,7 @@ set(FEATURE_HDF5_DEPENDS MPI) macro(FEATURE_HDF5_FIND_EXTERNAL var) - find_package(HDF5) + find_package(DEAL_II_HDF5) if(HDF5_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_50_p4est.cmake b/cmake/configure/configure_50_p4est.cmake index abaee83158..43328d40bf 100644 --- a/cmake/configure/configure_50_p4est.cmake +++ b/cmake/configure/configure_50_p4est.cmake @@ -21,7 +21,7 @@ set(FEATURE_P4EST_DEPENDS MPI) macro(FEATURE_P4EST_FIND_EXTERNAL var) - find_package(P4EST) + find_package(DEAL_II_P4EST) if(P4EST_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_50_scalapack.cmake b/cmake/configure/configure_50_scalapack.cmake index 2e09aea955..4e5a749a1a 100644 --- a/cmake/configure/configure_50_scalapack.cmake +++ b/cmake/configure/configure_50_scalapack.cmake @@ -21,7 +21,7 @@ set(FEATURE_SCALAPACK_DEPENDS MPI LAPACK) macro(FEATURE_SCALAPACK_FIND_EXTERNAL var) - find_package(SCALAPACK) + find_package(DEAL_II_SCALAPACK) if(SCALAPACK_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_50_slepc.cmake b/cmake/configure/configure_50_slepc.cmake index 940a15153d..fa272f6e6e 100644 --- a/cmake/configure/configure_50_slepc.cmake +++ b/cmake/configure/configure_50_slepc.cmake @@ -21,7 +21,7 @@ set(FEATURE_SLEPC_DEPENDS PETSC) macro(FEATURE_SLEPC_FIND_EXTERNAL var) - find_package(SLEPC) + find_package(DEAL_II_SLEPC) if(SLEPC_FOUND) # diff --git a/cmake/configure/configure_50_sundials.cmake b/cmake/configure/configure_50_sundials.cmake index 34a5a9350b..b6b6eb19ba 100644 --- a/cmake/configure/configure_50_sundials.cmake +++ b/cmake/configure/configure_50_sundials.cmake @@ -18,7 +18,7 @@ # macro(FEATURE_SUNDIALS_FIND_EXTERNAL var) - find_package(SUNDIALS) + find_package(DEAL_II_SUNDIALS) if(SUNDIALS_FOUND) set(${var} TRUE) diff --git a/cmake/configure/configure_50_symengine.cmake b/cmake/configure/configure_50_symengine.cmake index f02b30069d..ebe20e3f83 100644 --- a/cmake/configure/configure_50_symengine.cmake +++ b/cmake/configure/configure_50_symengine.cmake @@ -19,7 +19,7 @@ macro(FEATURE_SYMENGINE_FIND_EXTERNAL var) - find_package(SYMENGINE) + find_package(DEAL_II_SYMENGINE) if(SYMENGINE_FOUND) set(${var} TRUE) diff --git a/cmake/macros/macro_configure_feature.cmake b/cmake/macros/macro_configure_feature.cmake index 62a807186b..9a658c94c5 100644 --- a/cmake/macros/macro_configure_feature.cmake +++ b/cmake/macros/macro_configure_feature.cmake @@ -124,7 +124,7 @@ endmacro() # Default macro for finding an external library: # macro(FEATURE_FIND_EXTERNAL _feature _var) - find_package(${_feature}) + find_package(DEAL_II_${_feature}) if(${_feature}_FOUND) set(${_var} TRUE) endif() -- 2.39.5