From 646321d290b2db1d23dfe330d8ff2ce9f255e117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Sun, 4 Aug 2024 17:40:45 +0200 Subject: [PATCH] Use default syntax to include module `FindPackageHandleStandardArgs`. Use the default syntax to include the module `FindPackageHandleStandardArgs` now that there is no longer a conflict between the version of that module that is installed by CMake and the previously existing (old) copy of that module. --- cmake/Modules/FindCHOLMOD.cmake | 2 +- cmake/Modules/FindMMG.cmake | 2 +- cmake/Modules/FindMumps.cmake | 2 +- cmake/Modules/FindNETCDF.cmake | 2 +- cmake/Modules/FindPARMMG.cmake | 2 +- cmake/Modules/FindPHDF5.cmake | 2 +- cmake/Modules/FindUMFPACK.cmake | 2 +- cmake/Modules/FindXIOS.cmake | 2 +- cmake/Modules/FindZoltan.cmake | 2 +- elmerice/cmake/Modules/FindCSA.cmake | 2 +- elmerice/cmake/Modules/FindFORTRANGIS.cmake | 2 +- elmerice/cmake/Modules/FindNN.cmake | 2 +- elmerice/cmake/Modules/FindPROJ.cmake | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmake/Modules/FindCHOLMOD.cmake b/cmake/Modules/FindCHOLMOD.cmake index 8b4a0ce803..66edad4bc9 100644 --- a/cmake/Modules/FindCHOLMOD.cmake +++ b/cmake/Modules/FindCHOLMOD.cmake @@ -26,7 +26,7 @@ IF(UMFPACK_LIBRARIES AND UMFPACK_INCLUDE_DIR) ENDIF() # Fall back to manual search -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) SET(CHOLMOD_FOUND FALSE) MESSAGE(STATUS "Finding CHOLMOD") diff --git a/cmake/Modules/FindMMG.cmake b/cmake/Modules/FindMMG.cmake index 4fc0a7373b..382ec8fdb3 100644 --- a/cmake/Modules/FindMMG.cmake +++ b/cmake/Modules/FindMMG.cmake @@ -9,7 +9,7 @@ # MMG_LIBRARY - mmg library is # MMG_INCLUDE_DIR - mmg include dir. -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If MMG_LIBRARY and MMG_INCLUDE_DIR are already defined, do nothing IF(MMG_LIBRARY AND MMG_INCLUDE_DIR) diff --git a/cmake/Modules/FindMumps.cmake b/cmake/Modules/FindMumps.cmake index 6e6404f6ec..79e2e24a80 100644 --- a/cmake/Modules/FindMumps.cmake +++ b/cmake/Modules/FindMumps.cmake @@ -1,5 +1,5 @@ # cmake script for finding MUMPS sparse direct solver -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If Mumps libraries are already defined, do nothing IF(Mumps_LIBRARIES AND Mumps_INCLUDE_DIR) diff --git a/cmake/Modules/FindNETCDF.cmake b/cmake/Modules/FindNETCDF.cmake index 30398f625d..4c583f49a0 100644 --- a/cmake/Modules/FindNETCDF.cmake +++ b/cmake/Modules/FindNETCDF.cmake @@ -13,7 +13,7 @@ # # handle the QUIETLY and REQUIRED arguments and set NETCDF_FOUND to TRUE # if all listed variables are TRUE -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If NETCDF & NETCDF_FORTRAN libraries are already defined, do nothing IF(NETCDF_LIBRARIES AND NETCDF_INCLUDE_DIR) diff --git a/cmake/Modules/FindPARMMG.cmake b/cmake/Modules/FindPARMMG.cmake index 105a2afb59..d7619bc578 100644 --- a/cmake/Modules/FindPARMMG.cmake +++ b/cmake/Modules/FindPARMMG.cmake @@ -9,7 +9,7 @@ # PARMMG_LIBRARY - mmg library is # PARMMG_INCLUDE_DIR - mmg include dir. -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If MMG_LIBRARY and MMG_INCLUDE_DIR are already defined, do nothing IF(PARMMG_LIBRARY AND PARMMG_INCLUDE_DIR) diff --git a/cmake/Modules/FindPHDF5.cmake b/cmake/Modules/FindPHDF5.cmake index c133464952..4f31e25dda 100644 --- a/cmake/Modules/FindPHDF5.cmake +++ b/cmake/Modules/FindPHDF5.cmake @@ -13,7 +13,7 @@ # # handle the QUIETLY and REQUIRED arguments and set PHDF5_FOUND to TRUE # if all listed variables are TRUE -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If PHDF5 & PHDF5_HL libraries are already defined, do nothing IF(PHDF5_LIBRARIES AND PHDF5_INCLUDE_DIR) diff --git a/cmake/Modules/FindUMFPACK.cmake b/cmake/Modules/FindUMFPACK.cmake index 393adbef73..5757bee06a 100644 --- a/cmake/Modules/FindUMFPACK.cmake +++ b/cmake/Modules/FindUMFPACK.cmake @@ -26,7 +26,7 @@ IF(UMFPACK_LIBRARIES AND UMFPACK_INCLUDE_DIR) ENDIF() # Fall back to manual search -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) SET(UMFPACK_FOUND FALSE) MESSAGE(STATUS "Finding UMFPACK") diff --git a/cmake/Modules/FindXIOS.cmake b/cmake/Modules/FindXIOS.cmake index a163fe2a67..cac422c38d 100644 --- a/cmake/Modules/FindXIOS.cmake +++ b/cmake/Modules/FindXIOS.cmake @@ -12,7 +12,7 @@ # # handle the QUIETLY and REQUIRED arguments and set XIOS_FOUND to TRUE # if all listed variables are TRUE -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If XIOS is already defined, do nothing IF(XIOS_LIBRARIES AND XIOS_INCLUDE_DIR) diff --git a/cmake/Modules/FindZoltan.cmake b/cmake/Modules/FindZoltan.cmake index e831128827..2842cd36f8 100644 --- a/cmake/Modules/FindZoltan.cmake +++ b/cmake/Modules/FindZoltan.cmake @@ -9,7 +9,7 @@ # ZOLTAN_LIBRARY - zoltan library is # ZOLTAN_INCLUDE_DIR - zoltan include dir. -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If ZOLTAN_LIBRARY and ZOLTAN_INCLUDE_DIR are already defined, do nothing IF(ZOLTAN_LIBRARY AND ZOLTAN_INCLUDE_DIR) diff --git a/elmerice/cmake/Modules/FindCSA.cmake b/elmerice/cmake/Modules/FindCSA.cmake index 4ee7ffa71d..01eec5858f 100644 --- a/elmerice/cmake/Modules/FindCSA.cmake +++ b/elmerice/cmake/Modules/FindCSA.cmake @@ -11,7 +11,7 @@ # # handle the QUIETLY and REQUIRED arguments and set CSA_FOUND to TRUE # if all listed variables are TRUE -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If libraries are already defined, do nothing IF(CSA_LIBRARY AND CSA_INCLUDE_DIR) diff --git a/elmerice/cmake/Modules/FindFORTRANGIS.cmake b/elmerice/cmake/Modules/FindFORTRANGIS.cmake index 95cee27dec..b9ce3b211a 100644 --- a/elmerice/cmake/Modules/FindFORTRANGIS.cmake +++ b/elmerice/cmake/Modules/FindFORTRANGIS.cmake @@ -11,7 +11,7 @@ # # handle the QUIETLY and REQUIRED arguments and set FORTRANGIS_FOUND to TRUE # if all listed variables are TRUE -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If libraries are already defined, do nothing IF(FORTRANGIS_LIBRARY AND FORTRANGIS_INCLUDE_DIR) diff --git a/elmerice/cmake/Modules/FindNN.cmake b/elmerice/cmake/Modules/FindNN.cmake index add3f1cdb7..668d58bdd1 100644 --- a/elmerice/cmake/Modules/FindNN.cmake +++ b/elmerice/cmake/Modules/FindNN.cmake @@ -11,7 +11,7 @@ # # handle the QUIETLY and REQUIRED arguments and set NN_FOUND to TRUE # if all listed variables are TRUE -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If libraries are already defined, do nothing IF(NN_LIBRARY AND NN_INCLUDE_DIR) diff --git a/elmerice/cmake/Modules/FindPROJ.cmake b/elmerice/cmake/Modules/FindPROJ.cmake index 57e9c08a48..4f130b3887 100644 --- a/elmerice/cmake/Modules/FindPROJ.cmake +++ b/elmerice/cmake/Modules/FindPROJ.cmake @@ -11,7 +11,7 @@ # # handle the QUIETLY and REQUIRED arguments and set PROJ_FOUND to TRUE # if all listed variables are TRUE -INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +INCLUDE(FindPackageHandleStandardArgs) # If libraries are already defined, do nothing IF(PROJ_LIBRARY AND PROJ_INCLUDE_DIR)