From 894fa2d7c66ad03d70ca0e7d8e033eb8737076b8 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 5 Oct 2012 16:01:26 +0000 Subject: [PATCH] Remove DEAL_II_PACKAGE_STRING. This variable is superfluous git-svn-id: https://svn.dealii.org/branches/branch_cmake@26966 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/setup_deal_ii.cmake | 4 ---- deal.II/config/Config.cmake.in | 1 - deal.II/include/deal.II/base/config.h.in | 3 --- deal.II/source/base/data_out_base.cc | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 30a4e38aa1..7714db339c 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -31,7 +31,6 @@ # # DEAL_II_PACKAGE_NAME *) # DEAL_II_PACKAGE_VERSION -# DEAL_II_PACKAGE_STRING # DEAL_II_PACKAGE_BUGREPORT *) # DEAL_II_PACKAGE_URL *) # DEAL_II_VERSION_MAJOR @@ -139,9 +138,6 @@ ENDIF() SET_IF_EMPTY(DEAL_II_PACKAGE_NAME "deal.II") SET(DEAL_II_PACKAGE_VERSION ${VERSION}) -SET(DEAL_II_PACKAGE_STRING - "${DEAL_II_PACKAGE_NAME} ${DEAL_II_PACKAGE_VERSION}" - ) SET_IF_EMPTY(DEAL_II_PACKAGE_BUGREPORT "dealii@dealii.org") SET_IF_EMPTY(DEAL_II_PACKAGE_URL "http://www.dealii.org/") diff --git a/deal.II/config/Config.cmake.in b/deal.II/config/Config.cmake.in index 42a311a752..5aef14ccd9 100644 --- a/deal.II/config/Config.cmake.in +++ b/deal.II/config/Config.cmake.in @@ -28,7 +28,6 @@ SET(DEAL_II_PROJECT_CONFIG_INCLUDED TRUE) 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_PACKAGE_BUGREPORT "@DEAL_II_PACKAGE_BUGREPORT@") SET(DEAL_II_PACKAGE_URL "@DEAL_II_PACKAGE_URL@") diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index f9da08a7bc..83b3f7a4de 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -29,9 +29,6 @@ /* Define to the version of this package. */ #define DEAL_II_PACKAGE_VERSION "@DEAL_II_PACKAGE_VERSION@" -/* Define to the full name and version of this package. */ -#define DEAL_II_PACKAGE_STRING "@DEAL_II_PACKAGE_STRING@" - /* Define to the address where bug reports for this package should be sent. */ #define DEAL_II_PACKAGE_BUGREPORT "@DEAL_II_PACKAGE_BUGREPORT@" diff --git a/deal.II/source/base/data_out_base.cc b/deal.II/source/base/data_out_base.cc index 5a56f06a97..84770115b1 100644 --- a/deal.II/source/base/data_out_base.cc +++ b/deal.II/source/base/data_out_base.cc @@ -5252,7 +5252,7 @@ write_deal_II_intermediate (const std::vector > &patches, // then write a header out << "[deal.II intermediate format graphics data]" << '\n' - << "[written by " << DEAL_II_PACKAGE_STRING << "]" << '\n' + << "[written by " << DEAL_II_PACKAGE_NAME << " " << DEAL_II_PACKAGE_VERSION << "]" << '\n' << "[Version: " << Deal_II_IntermediateFlags::format_version << "]" << '\n'; out << data_names.size() << '\n'; -- 2.39.5