]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Change the variable names for deal as well
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Sep 2012 16:13:39 +0000 (16:13 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Sep 2012 16:13:39 +0000 (16:13 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26674 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/setup_deal_ii.cmake
deal.II/config/Config.cmake.in
deal.II/config/ConfigVersion.cmake.in
deal.II/config/Make.global_options.in
deal.II/include/deal.II/base/config.h.in

index 19c47df60994a800c2adde89a94894e7ba0ca13d..44cd99ca5280df2d3bc632302600311e46663419 100644 (file)
@@ -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}"
   )
 
 #
index e2def457e7ba559412bd6fdac6fbfebe6fd8e3fc..16bb1e2b0244c9a224a393cca12ca0880a707800 100644 (file)
@@ -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}")
index 5fe138968c765aec19bae2a7c71fadf6998003eb..af6afe8a61e8103d2c3b18ae87cb80137c56f652 100644 (file)
@@ -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}")
index 3bd7dfa503eed4333c81cfe1e9adcc2a8f0c3848..ff3da8b3c66aa1bac2118a4287f046e4742d44e7 100644 (file)
@@ -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
index dcdee6361ee9ac4d79a21cd13d2ab0d1a82fe04f..5298078b67cca1fef1218977c51495ec0283dc1a 100644 (file)
 #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@"
 
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.