From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Fri, 16 Aug 2013 21:55:16 +0000 (+0000)
Subject: CMake: Unify version variables
X-Git-Tag: v8.1.0~1054
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=172aa87d76fe49445381fa34be65e923c12975dc;p=dealii.git

CMake: Unify version variables

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

diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake
index 119fa42026..1b2bce5049 100644
--- a/deal.II/cmake/modules/FindPETSC.cmake
+++ b/deal.II/cmake/modules/FindPETSC.cmake
@@ -199,7 +199,9 @@ IF(PETSC_FOUND)
     PETSC_VERSION_PATCH "${PETSC_VERSION_PATCH_STRING}"
     )
 
-  SET(PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}")
+  SET(PETSC_VERSION
+    "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}.${PETSC_VERSION_PATCH}"
+    )
 
   MARK_AS_ADVANCED(PETSC_ARCH PETSC_DIR)
 ELSE()
diff --git a/deal.II/cmake/modules/FindSLEPC.cmake b/deal.II/cmake/modules/FindSLEPC.cmake
index ddb706d05b..9de3500f45 100644
--- a/deal.II/cmake/modules/FindSLEPC.cmake
+++ b/deal.II/cmake/modules/FindSLEPC.cmake
@@ -121,7 +121,9 @@ IF(SLEPC_FOUND)
     SLEPC_VERSION_PATCH "${SLEPC_VERSION_PATCH_STRING}"
     )
 
-  SET(SLEPC_VERSION "${SLEPC_VERSION_MAJOR}.${SLEPC_VERSION_MINOR}.${SLEPC_VERSION_SUBMINOR}")
+  SET(SLEPC_VERSION
+    "${SLEPC_VERSION_MAJOR}.${SLEPC_VERSION_MINOR}.${SLEPC_VERSION_SUBMINOR}.${SLEPC_VERSION_PATCH}"
+    )
 
   MARK_AS_ADVANCED(SLEPC_DIR)
 ELSE()
diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake
index f5f8d2240d..1840560458 100644
--- a/deal.II/cmake/modules/FindTRILINOS.cmake
+++ b/deal.II/cmake/modules/FindTRILINOS.cmake
@@ -22,6 +22,7 @@
 #   TRILINOS_DIR (cached)
 #   TRILINOS_INCLUDE_DIRS
 #   TRILINOS_LIBRARIES
+#   TRILINOS_VERSION
 #   TRILINOS_VERSION_MAJOR
 #   TRILINOS_VERSION_MINOR
 #   TRILINOS_VERSION_SUBMINOR
@@ -96,8 +97,10 @@ MARK_AS_ADVANCED(TRILINOS_CONFIG_DIR)
 
 IF(TRILINOS_FOUND)
   #
-  # Extract the major and minor version numbers:
+  # Extract version numbers:
   #
+  SET(TRILINOS_VERSION "${Trilinos_VERSION}")
+
   STRING(REGEX REPLACE
     "^([0-9]+).*$" "\\1"
     TRILINOS_VERSION_MAJOR "${Trilinos_VERSION}")