SET_IF_EMPTY(DEAL_II_PACKAGE_URL "http://www.dealii.org")
STRING(REGEX REPLACE
- "^([0-9]+)\\..*" "\\1" DEAL_II_MAJOR "${VERSION}"
+ "^([0-9]+)\\..*" "\\1" DEAL_II_VERSION_MAJOR "${VERSION}"
)
STRING(REGEX REPLACE
- "^[0-9]+\\.([0-9]+).*" "\\1" DEAL_II_MINOR "${VERSION}"
+ "^[0-9]+\\.([0-9]+).*" "\\1" DEAL_II_VERSION_MINOR "${VERSION}"
)
#
SET(DEAL_II_PACKAGE_VERSION "${DEAL_II_PACKAGE_VERSION}")
SET(DEAL_II_PACKAGE_STRING "${DEAL_II_PACKAGE_STRING}")
-SET(DEAL_II_VERSION "${DEAL_II_MAJOR}.${DEAL_II_MINOR}")
-SET(DEAL_II_MAJOR "${DEAL_II_MAJOR}")
-SET(DEAL_II_MINOR "${DEAL_II_MINOR}")
+SET(DEAL_II_VERSION "${DEAL_II_VERSION_MAJOR}.${DEAL_II_VERSION_MINOR}")
+SET(DEAL_II_VERSION_MAJOR "${DEAL_II_VERSION_MAJOR}")
+SET(DEAL_II_VERSION_MINOR "${DEAL_II_VERSION_MINOR}")
SET(DEAL_II_PACKAGE_BUGREPORT "${DEAL_II_PACKAGE_BUGREPORT}")
SET(DEAL_II_PACKAGE_TARNAME "${DEAL_II_PACKAGE_TARNAME}")
# As suggested by the cmake documentation
#
-set(PACKAGE_VERSION "@DEAL_II_MAJOR@.@DEAL_II_MINOR@")
+set(PACKAGE_VERSION "@DEAL_II_VERSION_MAJOR@.@DEAL_II_VERSION_MINOR@")
# Check whether the requested PACKAGE_FIND_VERSION is compatible
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
enable-shared = @MAKEFILE_enableshared@
enable-parser = @MAKEFILE_enableparser@
DEAL_II_VERSION = @VERSION@
-DEAL_II_MAJOR = @DEAL_II_MAJOR@
-DEAL_II_MINOR = @DEAL_II_MINOR@
+DEAL_II_MAJOR = @DEAL_II_VERSION_MAJOR@
+DEAL_II_MINOR = @DEAL_II_VERSION_MINOR@
#
# TODO: Reenable or remove
#define DEAL_II_PATH "@DEAL_II_PATH@"
/* Major version number of deal.II */
-#define DEAL_II_MAJOR "@DEAL_II_MAJOR@"
+#define DEAL_II_MAJOR "@DEAL_II_VERSION_MAJOR@" # legacy
+#define DEAL_II_VERSION_MAJOR "@DEAL_II_VERSION_MAJOR@"
/* Minor version number of deal.II */
-#define DEAL_II_MINOR "@DEAL_II_MINOR@"
+#define DEAL_II_MINOR "@DEAL_II_VERSION_MINOR@" # legacy
+#define DEAL_II_VERSION_MINOR "@DEAL_II_VERSION_MINOR@"