CMake: Cleanup

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

diff --git a/deal.II/cmake/configure/configure_2_metis.cmake b/deal.II/cmake/configure/configure_2_metis.cmake
index 8d83b9661d61d70fa8d1a7df3d2060186f7f0b7f..1a49a2c7c2bebd8bbfcab618e94a2e14c98d4f18 100644 (file)
--- a/deal.II/cmake/configure/configure_2_metis.cmake
+++ b/deal.II/cmake/configure/configure_2_metis.cmake
@@ -38,6 +38,7 @@ MACRO(FEATURE_METIS_FIND_EXTERNAL var)
       SET(METIS_DIR "" CACHE PATH
         "An optional hint to a metis directory"
         )
+      MARK_AS_ADVANCED(CLEAR METIS_DIR)
     ENDIF()
   ENDIF()
 ENDMACRO()

diff --git a/deal.II/cmake/configure/configure_2_petsc.cmake b/deal.II/cmake/configure/configure_2_petsc.cmake
index 77e5c320ccc13191ffb7f8ac3a5e891fe808915a..23465a2eb088e9e7b27aa94d8b366ee8823d6aef 100644 (file)
--- a/deal.II/cmake/configure/configure_2_petsc.cmake
+++ b/deal.II/cmake/configure/configure_2_petsc.cmake
@@ -104,6 +104,7 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var)
       SET(PETSC_ARCH "" CACHE STRING
         "An optional hint to a PETSc arch"
         )
+      MARK_AS_ADVANCED(CLEAR PETSC_DIR PETSC_ARCH)
     ENDIF()
   ENDIF()
 ENDMACRO()

diff --git a/deal.II/cmake/configure/configure_2_trilinos.cmake b/deal.II/cmake/configure/configure_2_trilinos.cmake
index 8b8ce3aee23c686814ddcdcdfbaf102f391e9f0c..ac15b3405123564435c034a5b19da41af2fbe254 100644 (file)
--- a/deal.II/cmake/configure/configure_2_trilinos.cmake
+++ b/deal.II/cmake/configure/configure_2_trilinos.cmake
@@ -181,6 +181,15 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     ENDIF()
 
   ENDIF(TRILINOS_FOUND)
+
+  IF(NOT ${var})
+    UNSET(TRILINOS_CONFIG CACHE)
+    SET(TRILINOS_DIR "" CACHE STRING
+      "An optional hint to a Trilinos installation"
+      )
+    MARK_AS_ADVANCED(CLEAR TRILINOS_DIR)
+  ENDIF()
+
 ENDMACRO()
 
 

diff --git a/deal.II/cmake/configure/configure_p4est.cmake b/deal.II/cmake/configure/configure_p4est.cmake
index 156d5b28b3b396775f49c8ba3d48e1d7fde8acad..9780127bc6d157952aecec14369f96b7cd6cd7e8 100644 (file)
--- a/deal.II/cmake/configure/configure_p4est.cmake
+++ b/deal.II/cmake/configure/configure_p4est.cmake
@@ -36,13 +36,16 @@ MACRO(FEATURE_P4EST_FIND_EXTERNAL var)
         "p4est has to be configured with MPI enabled.\n"
         )
 
-      UNSET(P4EST_LIBRARY CACHE)
+      UNSET(P4EST_LIBRARY_OPTIMIZED CACHE)
+      UNSET(P4EST_LIBRARY_DEBUG CACHE)
       UNSET(P4EST_INCLUDE_DIR CACHE)
-      UNSET(SC_LIBRARY CACHE)
+      UNSET(SC_LIBRARY_OPTIMIZED CACHE)
+      UNSET(SC_LIBRARY_DEBUG CACHE)
       UNSET(SC_INCLUDE_DIR CACHE)
       SET(P4EST_DIR "" CACHE PATH
         "An optional hint to a p4est installation/directory"
         )
+      MARK_AS_ADVANCED(CLEAR P4EST_DIR)
     ELSE()
       SET(${var} TRUE)
     ENDIF()

diff --git a/deal.II/cmake/configure/configure_slepc.cmake b/deal.II/cmake/configure/configure_slepc.cmake
index 3a4d42624a99de0de13548e5cc2c70f6a9b721ac..bf5415a0ff1deaac7af641df706736bc08b89de0 100644 (file)
--- a/deal.II/cmake/configure/configure_slepc.cmake
+++ b/deal.II/cmake/configure/configure_slepc.cmake
@@ -50,6 +50,7 @@ MACRO(FEATURE_SLEPC_FIND_EXTERNAL var)
       SET(SLEPC_DIR "" CACHE PATH
         "An optional hint to a SLEPc directory"
         )
+      MARK_AS_ADVANCED(CLEAR SLEPC_DIR)
 
       SET(${var} FALSE)
     ENDIF()

diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake
index 80cbd97d478f612d006d51dbc861ec738a21e5cb..29c9be531f88b298b7450509d677377486183767 100644 (file)
--- a/deal.II/cmake/modules/FindMETIS.cmake
+++ b/deal.II/cmake/modules/FindMETIS.cmake
@@ -24,6 +24,7 @@
 #   METIS_VERSION
 #   METIS_VERSION_MAJOR
 #   METIS_VERSION_MINOR
+#   METIS_VERSION_SUBMINOR
 #
 
 INCLUDE(FindPackageHandleStandardArgs)

diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake
index a90349c250f090cc4c13d34e7f91b6b7838ec70b..b5654ada1ab99a146635265d9150b9c4d6eea4b6 100644 (file)
--- a/deal.II/cmake/modules/FindP4EST.cmake
+++ b/deal.II/cmake/modules/FindP4EST.cmake
@@ -109,9 +109,11 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG
   )
 
 MARK_AS_ADVANCED(
-  P4EST_LIBRARY
+  P4EST_LIBRARY_OPTIMIZED
+  P4EST_LIBRARY_DEBUG
   P4EST_INCLUDE_DIR
-  SC_LIBRARY
+  SC_LIBRARY_OPTIMIZED
+  SC_LIBRARY_DEBUG
   SC_INCLUDE_DIR
   )
 

diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake
index b347b32ccf7cb9304d2b366a52ede902ffa69f0d..2ff349ebac8b26073404ff122a6a2760e58e8c10 100644 (file)
--- a/deal.II/cmake/modules/FindTRILINOS.cmake
+++ b/deal.II/cmake/modules/FindTRILINOS.cmake
@@ -141,6 +141,8 @@ FOREACH(_library ${Trilinos_LIBRARIES})
     NO_CMAKE_FIND_ROOT_PATH
     )
 
+  MARK_AS_ADVANCED(TRILINOS_LIBRARY_${_library})
+
   IF(TRILINOS_LIBRARY_${_library} MATCHES "-NOTFOUND")
     SET(TRILINOS_CONFIG_FOUND FALSE)
   ELSE()

diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample
index aeb340ced39091b0807b00c8cd5709cdedbe2592..df14dc07d3bc0d9deb6d4a67d72906babe08d56d 100644 (file)
--- a/deal.II/doc/development/Config.sample
+++ b/deal.II/doc/development/Config.sample
@@ -283,6 +283,10 @@
 # SET(METIS_FOUND TRUE CACHE BOOL "")
 # SET(METIS_LIBRARIES "library;and;semicolon;separated;list;of;link;interface" CACHE STRING "")
 # SET(METIS_INCLUDE_DIRS "semicolon;separated;list;of;include;dirs" CACHE STRING "")
+# SET(METIS_VERSION "x.y.z" CACHE STRING "")
+# SET(METIS_VERSION_MAJOR "x" CACHE STRING "")
+# SET(METIS_VERSION_MINOR "y" CACHE STRING "")
+# SET(METIS_VERSION_SUBMINOR "z" CACHE STRING "")
 #
 
 
@@ -400,6 +404,11 @@
 # SET(P4EST_LIBRARIES "library;and;semicolon;separated;list;of;link;interface" CACHE STRING "")
 # SET(P4EST_INCLUDE_DIRS "semicolon;separated;list;of;include;dirs" CACHE STRING "")
 # SET(P4EST_WITH_MPI TRUE CACHE BOOL "")
+# SET(P4EST_VERSION "x.y.z.p" CACHE STRING "")
+# SET(P4EST_VERSION_MAJOR "x" CACHE STRING "")
+# SET(P4EST_VERSION_MINOR "y" CACHE STRING "")
+# SET(P4EST_VERSION_SUBMINOR "z" CACHE STRING "")
+# SET(P4EST_VERSION_PATCH "p" CACHE STRING "")
 #
 
 
@@ -425,6 +434,7 @@
 # SET(PETSC_VERSION_MAJOR "x" CACHE STRING "")
 # SET(PETSC_VERSION_MINOR "y" CACHE STRING "")
 # SET(PETSC_VERSION_SUBMINOR "z" CACHE STRING "")
+# SET(PETSC_VERSION_PATCH "" CACHE STRING "")
 # SET(PETSC_WITH_MPI_UNI FALSE CACHE BOOL "")
 #
 
@@ -450,6 +460,7 @@
 # SET(SLEPC_VERSION_MAJOR "x" CACHE STRING "")
 # SET(SLEPC_VERSION_MINOR "y" CACHE STRING "")
 # SET(SLEPC_VERSION_SUBMINOR "z" CACHE STRING "")
+# SET(SLEPC_VERSION_PATCH "" CACHE STRING "")
 # SET(SLEPC_WITH_MPI_UNI FALSE CACHE BOOL "")
 #