From 6af53ce5d3a1ab2c5a0e2df8473fb1db33613f9d Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 10 Sep 2012 16:09:03 +0000 Subject: [PATCH] Some more basic configuration... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26273 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 14 ++++++++++++ deal.II/include/deal.II/base/config.h.in | 24 ++++++++++++++++---- deal.II/include/deal.II/base/config.h.in.old | 18 --------------- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index b1dc292736..e9f696eabb 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -2,6 +2,14 @@ PROJECT(deal.II) SET(VERSION "8.0.pre") +SET(DEAL_II_PACKAGE_BUGREPORT "dealii@dealii.org") +SET(DEAL_II_PACKAGE_NAME "deal.II") +SET(DEAL_II_PACKAGE_TARNAME ${DEAL_II_PACKAGE_NAME}) +SET(DEAL_II_PACKAGE_VERSION ${VERSION}) +SET(DEAL_II_PACKAGE_STRING "${DEAL_II_PACKAGE_NAME} ${DEAL_II_PACKAGE_VERSION}") +SET(DEAL_II_PACKAGE_URL "") + + # @@ -21,6 +29,7 @@ SET(CMAKE_MODULE_PATH + # # General configuration options: # @@ -70,6 +79,7 @@ OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK + # # Now, configure and configure a lot of things: # @@ -80,6 +90,7 @@ ADD_CUSTOM_TARGET(deal_ii_target_dependencies) + # # Platform checks: # @@ -88,6 +99,7 @@ INCLUDE(check_for_cxx_features) + # # Feature configuration: # @@ -104,6 +116,7 @@ ENDIF() + # # Build the toolchain: # @@ -112,6 +125,7 @@ ADD_SUBDIRECTORY(common/expand_instantiations) + # # Compile the library: # diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 3ec1f360e2..32f04518f5 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -11,13 +11,11 @@ // //---------------------------- config.h --------------------------- -/* - * TODO: Migrate all definitions from config.h.in.old to this file. - */ - #ifndef __deal2__config_h #define __deal2__config_h + + /** * Two macro names that we put at the top and bottom of all deal.II files * and that will be expanded to "namespace dealii {" and "}". @@ -25,6 +23,24 @@ #define DEAL_II_NAMESPACE_OPEN namespace dealii { #define DEAL_II_NAMESPACE_CLOSE } +/* Define to the full name of this package. */ +#cmakedefine DEAL_II_PACKAGE_NAME "@DEAL_II_PACKAGE_NAME@" + +/* Define to the one symbol short name of this package. */ +#cmakedefine DEAL_II_PACKAGE_TARNAME "@DEAL_II_PACKAGE_TARNAME@" + +/* Define to the version of this package. */ +#cmakedefine DEAL_II_PACKAGE_VERSION "@DEAL_II_PACKAGE_VERSION@" + +/* Define to the full name and version of this package. */ +#cmakedefine DEAL_II_PACKAGE_STRING "@DEAL_II_PACKAGE_STRING@" + +/* Define to the address where bug reports for this package should be sent. */ +#cmakedefine DEAL_II_PACKAGE_BUGREPORT "@DEAL_II_PACKAGE_BUGREPORT@" + +/* Define to the home page for this package. */ +#cmakedefine DEAL_II_PACKAGE_URL "@DEAL_II_PACKAGE_URL@" + diff --git a/deal.II/include/deal.II/base/config.h.in.old b/deal.II/include/deal.II/base/config.h.in.old index e3e8fe3a6c..3ffbd67fbc 100644 --- a/deal.II/include/deal.II/base/config.h.in.old +++ b/deal.II/include/deal.II/base/config.h.in.old @@ -505,24 +505,6 @@ by the preprocessor variable. */ #cmakedefine NO_HAVE_GETRUSAGE -/* Define to the address where bug reports for this package should be sent. */ -#cmakedefine PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#cmakedefine PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#cmakedefine PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#cmakedefine PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#cmakedefine PACKAGE_URL - -/* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION - /* Make sure PETSc doesn't re-define the underscore through the preprocessor, since this interferes with boost. PETSc redefines the underscore to be "__gterr =", but then forgets to undef this thing. Boost simply wants to -- 2.39.5