From 74778e9700eaca2b54a0c345caa45b8d378b6215 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 15 Mar 2013 10:12:46 +0000 Subject: [PATCH] CMake: Bugfix git-svn-id: https://svn.dealii.org/trunk@28911 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_metis.cmake | 2 +- deal.II/cmake/configure/configure_p4est.cmake | 2 +- deal.II/cmake/configure/configure_petsc.cmake | 2 +- deal.II/cmake/configure/configure_slepc.cmake | 2 +- deal.II/cmake/modules/FindARPACK.cmake | 2 +- deal.II/cmake/modules/FindHDF5.cmake | 2 +- deal.II/cmake/modules/FindMETIS.cmake | 2 +- deal.II/cmake/modules/FindMUMPS.cmake | 2 +- deal.II/cmake/modules/FindNETCDF.cmake | 2 +- deal.II/cmake/modules/FindP4EST.cmake | 2 +- deal.II/cmake/modules/FindPETSC.cmake | 2 +- deal.II/cmake/modules/FindSCALAPACK.cmake | 4 ++-- deal.II/cmake/modules/FindSLEPC.cmake | 2 +- deal.II/cmake/modules/FindTRILINOS.cmake | 2 +- deal.II/cmake/modules/FindUMFPACK.cmake | 4 ++-- deal.II/doc/development/cmake-internals.html | 15 +++++++++++++++ 16 files changed, 32 insertions(+), 17 deletions(-) diff --git a/deal.II/cmake/configure/configure_metis.cmake b/deal.II/cmake/configure/configure_metis.cmake index 89b85c6944..14f76ca5f5 100644 --- a/deal.II/cmake/configure/configure_metis.cmake +++ b/deal.II/cmake/configure/configure_metis.cmake @@ -33,7 +33,7 @@ MACRO(FEATURE_METIS_FIND_EXTERNAL var) UNSET(METIS_LIBRARY CACHE) UNSET(METIS_INCLUDE_DIR CACHE) - SET(METIS_DIR "" CACHE STRING + SET(METIS_DIR "" CACHE PATH "An optional hint to a metis directory" ) ENDIF() diff --git a/deal.II/cmake/configure/configure_p4est.cmake b/deal.II/cmake/configure/configure_p4est.cmake index 0cd5c15dbf..b984c30521 100644 --- a/deal.II/cmake/configure/configure_p4est.cmake +++ b/deal.II/cmake/configure/configure_p4est.cmake @@ -38,7 +38,7 @@ MACRO(FEATURE_P4EST_FIND_EXTERNAL var) UNSET(P4EST_INCLUDE_DIR CACHE) UNSET(SC_LIBRARY CACHE) UNSET(SC_INCLUDE_DIR CACHE) - SET(P4EST_DIR "" CACHE STRING + SET(P4EST_DIR "" CACHE PATH "An optional hint to a p4est installation/directory" ) ELSE() diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake index bb826729aa..4a526e7f77 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_petsc.cmake @@ -69,7 +69,7 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var) UNSET(PETSC_INCLUDE_DIR_ARCH CACHE) UNSET(PETSC_INCLUDE_DIR_COMMON CACHE) UNSET(PETSC_LIBRARY CACHE) - SET(PETSC_DIR "" CACHE STRING + SET(PETSC_DIR "" CACHE PATH "An optional hint to a PETSc directory" ) SET(PETSC_ARCH "" CACHE STRING diff --git a/deal.II/cmake/configure/configure_slepc.cmake b/deal.II/cmake/configure/configure_slepc.cmake index 381d7b534d..f5a3955568 100644 --- a/deal.II/cmake/configure/configure_slepc.cmake +++ b/deal.II/cmake/configure/configure_slepc.cmake @@ -40,7 +40,7 @@ MACRO(FEATURE_SLEPC_FIND_EXTERNAL var) UNSET(SLEPC_INCLUDE_DIR_ARCH CACHE) UNSET(SLEPC_INCLUDE_DIR_COMMON CACHE) UNSET(SLEPC_LIBRARY CACHE) - SET(SLEPC_DIR "" CACHE STRING + SET(SLEPC_DIR "" CACHE PATH "An optional hint to a SLEPc directory" ) SET(SLEPC_ARCH "" CACHE STRING diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake index a9f62e17e4..a57f307961 100644 --- a/deal.II/cmake/modules/FindARPACK.cmake +++ b/deal.II/cmake/modules/FindARPACK.cmake @@ -62,7 +62,7 @@ IF(ARPACK_FOUND) ARPACK_DIR ) ELSE() - SET(ARPACK_DIR "" CACHE STRING + SET(ARPACK_DIR "" CACHE PATH "An optional hint to an ARPACK installation" ) ENDIF() diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake index f257990851..12675f7ed2 100644 --- a/deal.II/cmake/modules/FindHDF5.cmake +++ b/deal.II/cmake/modules/FindHDF5.cmake @@ -82,7 +82,7 @@ IF(HDF5_FOUND) HDF5_INCLUDE_DIR ) ELSE() - SET(HDF5_DIR "" CACHE STRING + SET(HDF5_DIR "" CACHE PATH "An optional hint to an hdf5 directory" ) ENDIF() diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index 90981b7b65..b0a92789ee 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -73,7 +73,7 @@ IF(METIS_FOUND) METIS_DIR ) ELSE() - SET(METIS_DIR "" CACHE STRING + SET(METIS_DIR "" CACHE PATH "An optional hint to a metis directory" ) ENDIF() diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index 866f2001d1..0c3bcf2952 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -103,7 +103,7 @@ IF(MUMPS_FOUND) PORT_LIBRARY ) ELSE() - SET(MUMPS_DIR "" CACHE STRING + SET(MUMPS_DIR "" CACHE PATH "An optional hint to a mumps directory" ) ENDIF() diff --git a/deal.II/cmake/modules/FindNETCDF.cmake b/deal.II/cmake/modules/FindNETCDF.cmake index a9a2098a0d..6dfba5efea 100644 --- a/deal.II/cmake/modules/FindNETCDF.cmake +++ b/deal.II/cmake/modules/FindNETCDF.cmake @@ -77,7 +77,7 @@ IF(NETCDF_FOUND) NETCDF_DIR ) ELSE() - SET(NETCDF_DIR "" CACHE STRING + SET(NETCDF_DIR "" CACHE PATH "An optional hint to a NETCDF installation" ) ENDIF() diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake index 2c2de6c1bd..e2c0727dc8 100644 --- a/deal.II/cmake/modules/FindP4EST.cmake +++ b/deal.II/cmake/modules/FindP4EST.cmake @@ -117,7 +117,7 @@ IF(P4EST_FOUND) SC_INCLUDE_DIR ) ELSE() - SET(P4EST_DIR "" CACHE STRING + SET(P4EST_DIR "" CACHE PATH "An optional hint to a p4est installation/directory" ) ENDIF() diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake index 321522e66b..af236f2643 100644 --- a/deal.II/cmake/modules/FindPETSC.cmake +++ b/deal.II/cmake/modules/FindPETSC.cmake @@ -166,7 +166,7 @@ IF(PETSC_FOUND) PETSC_LIBRARY ) ELSE() - SET(PETSC_DIR "" CACHE STRING + SET(PETSC_DIR "" CACHE PATH "An optional hint to a PETSc directory" ) SET(PETSC_ARCH "" CACHE STRING diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake index eea11af98e..51ca5b43a1 100644 --- a/deal.II/cmake/modules/FindSCALAPACK.cmake +++ b/deal.II/cmake/modules/FindSCALAPACK.cmake @@ -93,10 +93,10 @@ IF(SCALAPACK_FOUND) BLACSF77INIT_LIBRARY ) ELSE() - SET(SCALAPACK_DIR "" CACHE STRING + SET(SCALAPACK_DIR "" CACHE PATH "An optional hint to a SCALAPACK directory" ) - SET(BLACS_DIR "" CACHE STRING + SET(BLACS_DIR "" CACHE PATH "An optional hint to a BLACS directory" ) ENDIF() diff --git a/deal.II/cmake/modules/FindSLEPC.cmake b/deal.II/cmake/modules/FindSLEPC.cmake index 9c121c0c8b..c107e3ed0f 100644 --- a/deal.II/cmake/modules/FindSLEPC.cmake +++ b/deal.II/cmake/modules/FindSLEPC.cmake @@ -126,7 +126,7 @@ IF(SLEPC_FOUND) SLEPC_LIBRARY ) ELSE() - SET(SLEPC_DIR "" CACHE STRING + SET(SLEPC_DIR "" CACHE PATH "An optional hint to a SLEPC directory" ) SET(SLEPC_ARCH "" CACHE STRING diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake index 220079d303..0c30184f78 100644 --- a/deal.II/cmake/modules/FindTRILINOS.cmake +++ b/deal.II/cmake/modules/FindTRILINOS.cmake @@ -127,7 +127,7 @@ IF(TRILINOS_FOUND) ELSE() - SET(TRILINOS_DIR "" CACHE STRING + SET(TRILINOS_DIR "" CACHE PATH "An optional hint to a Trilinos installation" ) ENDIF() diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake index 3fbff98975..6029fe6d4a 100644 --- a/deal.II/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/cmake/modules/FindUMFPACK.cmake @@ -151,10 +151,10 @@ IF(UMFPACK_FOUND) SUITESPARSE_DIR ) ELSE() - SET(UMFPACK_DIR "" CACHE STRING + SET(UMFPACK_DIR "" CACHE PATH "An optional hint to an UMFPACK directory" ) - SET(SUITESPARSE_DIR "" CACHE STRING + SET(SUITESPARSE_DIR "" CACHE PATH "An optional hint to a SUITESPARSE directory" ) ENDIF() diff --git a/deal.II/doc/development/cmake-internals.html b/deal.II/doc/development/cmake-internals.html index 04644b250a..e35a995dea 100644 --- a/deal.II/doc/development/cmake-internals.html +++ b/deal.II/doc/development/cmake-internals.html @@ -364,6 +364,21 @@ "global" variables prefixed by FEATURE_ may be altered. Do not set DEAL_II_* or CMAKE_* variables directly! +
  • + A hint with FEATURE_DIR can be set up for + convenience. It is best to start the Find module by + 
    +
+    SET_IF_EMPTY(FEATURE_DIR "$ENV{FEATURE_DIR}")
+
    + and use FEATURE_DIR as a hint. If the external + library could be found, hide it via + MARK_AS_ADVANCED, if the external library could not + be found, set a cache value: + 
    +
+    SET(FEATURE_DIR "" CACHE PATH "An optional hint to a FEATURE directory")
+
    -- 2.39.5