]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some more basic configuration...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 10 Sep 2012 16:09:03 +0000 (16:09 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 10 Sep 2012 16:09:03 +0000 (16:09 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26273 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/include/deal.II/base/config.h.in
deal.II/include/deal.II/base/config.h.in.old

index b1dc2927365994d7a5baa9f02c461ab38312c574..e9f696eabb84254d5dfbbe9a0ed03d877c352076 100644 (file)
@@ -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:
 #
index 3ec1f360e24b17cb5a6ed91cabf981c94f794592..32f04518f5a1b24652910a3ca3e01d319c2e631f 100644 (file)
 //
 //----------------------------  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 "}".
 #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@"
+
 
 
 
index e3e8fe3a6cf80ab1766a516998d9ed14f9c14ab6..3ffbd67fbcf9f60fd016a34fa2f9a769a40f910f 100644 (file)
    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

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.