From: maier Date: Mon, 24 Sep 2012 16:13:39 +0000 (+0000) Subject: Change the variable names for deal as well X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1fb4c6db19d6fa6b4449451fac15a55bbc15031;p=dealii-svn.git Change the variable names for deal as well git-svn-id: https://svn.dealii.org/branches/branch_cmake@26674 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 19c47df609..44cd99ca52 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -14,10 +14,10 @@ SET_IF_EMPTY(DEAL_II_PACKAGE_TARNAME ${DEAL_II_PACKAGE_NAME}) #TODO 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}" ) # diff --git a/deal.II/config/Config.cmake.in b/deal.II/config/Config.cmake.in index e2def457e7..16bb1e2b02 100644 --- a/deal.II/config/Config.cmake.in +++ b/deal.II/config/Config.cmake.in @@ -11,9 +11,9 @@ SET(DEAL_II_PACKAGE_NAME "${DEAL_II_PACKAGE_NAME}") 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}") diff --git a/deal.II/config/ConfigVersion.cmake.in b/deal.II/config/ConfigVersion.cmake.in index 5fe138968c..af6afe8a61 100644 --- a/deal.II/config/ConfigVersion.cmake.in +++ b/deal.II/config/ConfigVersion.cmake.in @@ -3,7 +3,7 @@ # 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}") diff --git a/deal.II/config/Make.global_options.in b/deal.II/config/Make.global_options.in index 3bd7dfa503..ff3da8b3c6 100644 --- a/deal.II/config/Make.global_options.in +++ b/deal.II/config/Make.global_options.in @@ -65,8 +65,8 @@ enable-threads = @MAKEFILE_enablethreads@ 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 diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index dcdee6361e..5298078b67 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -41,10 +41,12 @@ #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@"