define deal.II version always as X.Y.Z

diff --git a/VERSION b/VERSION
index d4140c6c2626b6be06eded0432c70a07d43ae4b2..579969df86074b80b6e49496abd5b2d138fa5146 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.4.pre
+8.4.0-pre

diff --git a/cmake/config/ConfigVersion.cmake.in b/cmake/config/ConfigVersion.cmake.in
index af6afe8a61e8103d2c3b18ae87cb80137c56f652..627c1bea4d1a5b4c411ee16c063f480b8f2310c7 100644 (file)
--- a/cmake/config/ConfigVersion.cmake.in
+++ b/cmake/config/ConfigVersion.cmake.in
@@ -3,7 +3,7 @@
 # As suggested by the cmake documentation
 #
 
-set(PACKAGE_VERSION "@DEAL_II_VERSION_MAJOR@.@DEAL_II_VERSION_MINOR@")
+set(PACKAGE_VERSION "@DEAL_II_VERSION_MAJOR@.@DEAL_II_VERSION_MINOR@.@DEAL_II_VERSION_SUBMINOR@")
 
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")

diff --git a/cmake/setup_deal_ii.cmake b/cmake/setup_deal_ii.cmake
index c5dd78fc0751c578a767e6f4b1088ae24bf338f3..014c9e89d6d22e14ec299625a5c1890556b512af 100644 (file)
--- a/cmake/setup_deal_ii.cmake
+++ b/cmake/setup_deal_ii.cmake
@@ -77,9 +77,8 @@ FILE(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" _version LIMIT_COUNT 1)
 SET_IF_EMPTY(DEAL_II_PACKAGE_VERSION "${_version}")
 
 #
-# We expect a version number of the form "X.Y.Z", where X and Y are always
-# numbers and Z is either a third number (for a release version) or a short
-# string.
+# We expect a version number of the form "X.Y.Z" or "X.Y.Z-bla", where X, Y, Z
+# are always numbers and bla is a short string ("pre", "rc0", "rc1", etc.).
 #
 STRING(REGEX REPLACE "^([0-9]+)\\..*" "\\1"
   DEAL_II_VERSION_MAJOR "${DEAL_II_PACKAGE_VERSION}"
@@ -87,18 +86,10 @@ STRING(REGEX REPLACE "^([0-9]+)\\..*" "\\1"
 STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1"
   DEAL_II_VERSION_MINOR "${DEAL_II_PACKAGE_VERSION}"
   )
+STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1"
+  DEAL_II_VERSION_SUBMINOR "${DEAL_II_PACKAGE_VERSION}"
+  )
 
-#
-# If Z is not a number, replace it with "0", otherwise extract version
-# number:
-#
-IF(DEAL_II_PACKAGE_VERSION MATCHES "^[0-9]+\\.[0-9]+.*\\.[0-9]+.*")
-  STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+.*\\.([0-9]+).*" "\\1"
-    DEAL_II_VERSION_SUBMINOR "${DEAL_II_PACKAGE_VERSION}"
-    )
-ELSE()
-  SET(DEAL_II_VERSION_SUBMINOR "0")
-ENDIF()
 SET(DEAL_II_VERSION ${DEAL_II_VERSION_MAJOR}.${DEAL_II_VERSION_MINOR}.${DEAL_II_VERSION_SUBMINOR})