CMake: Bugfix

git-svn-id: https://svn.dealii.org/trunk@28911 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/configure/configure_metis.cmake b/deal.II/cmake/configure/configure_metis.cmake
index 89b85c6944a07ed3dc69a708344e5f5041f031b7..14f76ca5f5c416f494b25abc395d22649d1b9ea1 100644 (file)
--- 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 0cd5c15dbf20074c03e11f9478e9a253269fd198..b984c30521e263bd3cd8444bd347fefe39b90a71 100644 (file)
--- 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 bb826729aa7f452806ebee4174b531555fa8d24a..4a526e7f77498fc0f8436b803a0d972775df3f9e 100644 (file)
--- 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 381d7b534dff4b9c1f232fc623752bacde7b07ca..f5a39555680535ba79b54362d6d9cbfe29eef92d 100644 (file)
--- 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 a9f62e17e4cc1e07d200e016e61b3e078a07f21d..a57f307961e6bf37390da493386cf9bf741a2ac8 100644 (file)
--- 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 f257990851f43cad483332405b488469c5f6ddd3..12675f7ed2407a811b87a54d37c71617586589c8 100644 (file)
--- 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 90981b7b653807d23b014f4d2dbd4f1ba0787683..b0a92789ee3618228b5046314b34dc69b293c3a6 100644 (file)
--- 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 866f2001d1cc83de040b23b0a4537682dc935930..0c3bcf2952e2136acf95e6bb749a5cc37e9f1ede 100644 (file)
--- 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 a9a2098a0d8d93f4160e63968f65a774afc3a797..6dfba5efea04e74f1383969beb408f986cee21b2 100644 (file)
--- 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 2c2de6c1bd8c50a2adc91197fd67547d3c460753..e2c0727dc8bddb5493acd215e34c911292636552 100644 (file)
--- 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 321522e66b990e0c386d1842b72bec13270b5774..af236f264387f131e2b7e96bea815fad06b1e891 100644 (file)
--- 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 eea11af98ee4dff6abbd0d408b2ae166e92ca381..51ca5b43a1916df497ccefd1f9ece2545f1c8b37 100644 (file)
--- 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 9c121c0c8bb8b80cf95d08559efd6fbc58f041d0..c107e3ed0f6a7f55029416bb3bafbec11995f34b 100644 (file)
--- 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 220079d303f7848db58707725d0f1684a11bd7d0..0c30184f78fa58fe438c2837fb16ab4010e5ff4e 100644 (file)
--- 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 3fbff98975684b5de451271d4d8d3d0cd6ad8f0c..6029fe6d4a299bf912ba900aca59da6beb53536d 100644 (file)
--- 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 04644b250ae08830ba7aaefc4a1c50770990ffb7..e35a995dea38694e17224e9a7691b67fa7a89919 100644 (file)
--- a/deal.II/doc/development/cmake-internals.html
+++ b/deal.II/doc/development/cmake-internals.html
@@ -364,6 +364,21 @@
           "global" variables prefixed by <code>FEATURE_</code> may be
           altered. Do not set <code>DEAL_II_*</code> or <code>CMAKE_*</code>
           variables directly!
+        <li>
+          A hint with <code>FEATURE_DIR</code> can be set up for
+          convenience. It is best to start the <code>Find</code> module by
+          <pre>
+
+    SET_IF_EMPTY(FEATURE_DIR "$ENV{FEATURE_DIR}")
+          </pre>
+          and use <code>FEATURE_DIR</code> as a hint. If the external
+          library could be found, hide it via
+          <code>MARK_AS_ADVANCED</code>, if the external library could not
+          be found, set a cache value:
+          <pre>
+
+    SET(FEATURE_DIR "" CACHE PATH "An optional hint to a FEATURE directory")
+          </pre>
       </ul>