Kill off all instances of SLEPC_ARCH in configure. There is no such thing - it is...

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

diff --git a/deal.II/cmake/configure/configure_slepc.cmake b/deal.II/cmake/configure/configure_slepc.cmake
index f5a39555680535ba79b54362d6d9cbfe29eef92d..cc1ff2b65ee6266105f3bb9096632f00bdc8d524 100644 (file)
--- a/deal.II/cmake/configure/configure_slepc.cmake
+++ b/deal.II/cmake/configure/configure_slepc.cmake
@@ -43,9 +43,6 @@ MACRO(FEATURE_SLEPC_FIND_EXTERNAL var)
       SET(SLEPC_DIR "" CACHE PATH
         "An optional hint to a SLEPc directory"
         )
-      SET(SLEPC_ARCH "" CACHE STRING
-        "An optional hint to a SLEPc arch"
-        )
 
       SET(${var} FALSE)
     ENDIF()
@@ -74,8 +71,8 @@ MACRO(FEATURE_SLEPC_ERROR_MESSAGE)
     "    $ SLEPC_DIR=\"...\" cmake <...>\n"
     "    $ cmake -DSLEPC_DIR=\"...\" <...>\n"
     "SLEPc compiled in source tree:\n"
-    "    $ SLEPC_DIR=\"...\"  SLEPC_ARCH=\"...\" cmake <...>\n"
-    "    $ cmake -DSLEPC_DIR=\"...\" -DSLEPC_ARCH=\"...\" <...>\n"
+    "    $ SLEPC_DIR=\"...\"\n"
+    "    $ cmake -DSLEPC_DIR=\"...\"\n"
     "or set the relevant variables by hand in ccmake.\n\n"
     )
 ENDMACRO()

diff --git a/deal.II/cmake/modules/FindSLEPC.cmake b/deal.II/cmake/modules/FindSLEPC.cmake
index c107e3ed0f6a7f55029416bb3bafbec11995f34b..b4c5c04676dfe5a7e777a922ba04dd2d4754774d 100644 (file)
--- a/deal.II/cmake/modules/FindSLEPC.cmake
+++ b/deal.II/cmake/modules/FindSLEPC.cmake
@@ -30,7 +30,6 @@
 INCLUDE(FindPackageHandleStandardArgs)
 
 SET_IF_EMPTY(SLEPC_DIR "$ENV{SLEPC_DIR}")
-SET_IF_EMPTY(SLEPC_ARCH "$ENV{SLEPC_ARCH}")
 SET_IF_EMPTY(PETSC_DIR "$ENV{PETSC_DIR}")
 SET_IF_EMPTY(PETSC_ARCH "$ENV{PETSC_ARCH}")
 
@@ -44,7 +43,6 @@ FIND_LIBRARY(SLEPC_LIBRARY
   HINTS
     # SLEPC is special. Account for that
     ${SLEPC_DIR}
-    ${SLEPC_DIR}/${SLEPC_ARCH}
     ${SLEPC_DIR}/${PETSC_ARCH}
     ${PETSC_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
@@ -54,7 +52,6 @@ FIND_PATH(SLEPC_INCLUDE_DIR_ARCH slepcconf.h
   HINTS
     # SLEPC is special. Account for that
     ${SLEPC_DIR}
-    ${SLEPC_DIR}/${SLEPC_ARCH}
     ${SLEPC_DIR}/${PETSC_ARCH}
     ${SLEPC_INCLUDE_DIRS}
     ${PETSC_DIR}
@@ -64,7 +61,6 @@ FIND_PATH(SLEPC_INCLUDE_DIR_ARCH slepcconf.h
 FIND_PATH(SLEPC_INCLUDE_DIR_COMMON slepcversion.h
   HINTS
     ${SLEPC_DIR}
-    ${SLEPC_DIR}/${SLEPC_ARCH}
     ${SLEPC_DIR}/${PETSC_ARCH}
     ${SLEPC_INCLUDE_DIRS}
     ${PETSC_DIR}
@@ -118,7 +114,6 @@ IF(SLEPC_FOUND)
   SET(SLEPC_VERSION "${SLEPC_VERSION_MAJOR}.${SLEPC_VERSION_MINOR}.${SLEPC_VERSION_SUBMINOR}")
 
   MARK_AS_ADVANCED(
-    SLEPC_ARCH
     SLEPC_DIR
     SLEPC_INCLUDE_DIR_ARCH
     SLEPC_INCLUDE_DIR_COMMON
@@ -129,8 +124,5 @@ ELSE()
   SET(SLEPC_DIR "" CACHE PATH
     "An optional hint to a SLEPC directory"
     )
-  SET(SLEPC_ARCH "" CACHE STRING
-    "An optional hint to a SLEPC arch"
-    )
 ENDIF()
 

diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample
index a1d5d62e89fc7a226e28d828e49e1660f9fd4063..30b3671fe4adafec5f644412ef3d4641e34e41a6 100644 (file)
--- a/deal.II/doc/development/Config.sample
+++ b/deal.II/doc/development/Config.sample
@@ -399,7 +399,6 @@
 #
 # Specify a hint with CMAKE_PREFIX_PATH or by setting
 # SET(SLEPC_DIR "/.../..." CACHE PATH "")
-# SET(SLEPC_ARCH "..." CACHE STRING "")
 #
 # Manual setup:
 #

diff --git a/deal.II/doc/development/cmake.html b/deal.II/doc/development/cmake.html
index aadc8a9b8c34c1cec1b64a611318fbf08221e0d2..242a3f6e5546c9ea8889cfbf33c7c519e38df308 100644 (file)
--- a/deal.II/doc/development/cmake.html
+++ b/deal.II/doc/development/cmake.html
@@ -356,7 +356,7 @@
     MUMPS_DIR (and SCALAPACK_DIR, BLACS_DIR),
     P4EST_DIR (and SC_DIR),
     PETSC_DIR and PETSC_ARCH (forming ${PETSC_DIR}/${PETSC_ARCH}),
-    SLEPC_DIR and SLEPC_ARCH (forming ${SLEPC_DIR}/${SLEPC_ARCH}),
+    SLEPC_DIR (forming ${SLEPC_DIR}/${PETSC_ARCH}),
     TBB_DIR,
     TRILINOS_DIR,
     UMFPACK_DIR and SUITESPARSE_DIR (AMD_DIR, CHOLMOD_DIR, COLAMD_DIR, SUITESPARSECONFIG_DIR)