cleanup the config.hh.in file

cmake/modules/DuneMacros.cmake

@@ -1198,11 +1198,28 @@ endmacro(add_dune_all_flags targets)
 
 
 # create a module specific config header file and force an include
-macro(dune_add_config_header _config_hh_in _config_hh)
-  set(_config_hh_tmp ${CMAKE_CURRENT_BINARY_DIR}/config.hh.in)
+function(dune_add_config_header _config_hh_in _config_hh)
+  set(_config_hh_tmp ${CMAKE_CURRENT_BINARY_DIR}/${_config_hh_in}.tmp)
   file(READ ${_config_hh_in} _config_hh_content)
   file(WRITE ${_config_hh_tmp} "${_config_hh_content}")
 
+  # append version information about the current module
+  dune_module_to_uppercase(PROJECT_NAME ${ProjectName})
+  file(APPEND ${_config_hh_tmp}
+"
+/* Define to the version of ${ProjectName} */
+#define ${PROJECT_NAME}_VERSION \"\${${PROJECT_NAME}_VERSION}\"
+
+/* Define to the major version of ${ProjectName} */
+#define ${PROJECT_NAME}_VERSION_MAJOR \${${PROJECT_NAME}_VERSION_MAJOR}
+
+/* Define to the minor version of ${ProjectName} */
+#define ${PROJECT_NAME}_VERSION_MINOR \${${PROJECT_NAME}_VERSION_MINOR}
+
+/* Define to the revision of ${ProjectName} */
+#define ${PROJECT_NAME}_VERSION_REVISION \${${PROJECT_NAME}_VERSION_REVISION}
+")
+
   # define that we found this module
   set(${ProjectName}_FOUND 1)
   foreach(_dep ${ProjectName} ${ALL_DEPENDENCIES})
@@ -1213,4 +1230,4 @@ macro(dune_add_config_header _config_hh_in _config_hh)
   endforeach()
 
   configure_file(${_config_hh_tmp} ${_config_hh})
-endmacro(dune_add_config_header)
+endfunction(dune_add_config_header)

dune/common/config.hh.in

@@ -9,18 +9,6 @@
  * without the file extending as dune/common/config.hh
 **/
 
-/* Define to the version of dune-common */
-#define DUNE_COMMON_VERSION "${DUNE_COMMON_VERSION}"
-
-/* Define to the major version of dune-common */
-#define DUNE_COMMON_VERSION_MAJOR ${DUNE_COMMON_VERSION_MAJOR}
-
-/* Define to the minor version of dune-common */
-#define DUNE_COMMON_VERSION_MINOR ${DUNE_COMMON_VERSION_MINOR}
-
-/* Define to the revision of dune-common */
-#define DUNE_COMMON_VERSION_REVISION ${DUNE_COMMON_VERSION_REVISION}
-
 /* Standard debug streams with a level below will collapse to doing nothing */
 #define DUNE_MINIMAL_DEBUG_LEVEL ${DUNE_MINIMAL_DEBUG_LEVEL}
 
@@ -110,49 +98,6 @@
 /* Define to 1 if the compiler properly supports testing for operator[] */
 #cmakedefine HAVE_IS_INDEXABLE_SUPPORT 1
 
-/* Define to ENABLE_UMFPACK if the UMFPack library is available */
-#cmakedefine HAVE_UMFPACK ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse library is available */
-#cmakedefine HAVE_SUITESPARSE ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's AMD library is available */
-#cmakedefine HAVE_SUITESPARSE_AMD ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's BTF library is available */
-#cmakedefine HAVE_SUITESPARSE_BTF ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's CAMD library is available */
-#cmakedefine HAVE_SUITESPARSE_CAMD ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's CCOLAMD library is available */
-#cmakedefine HAVE_SUITESPARSE_CCOLAMD ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's CHOLMOD library is available */
-#cmakedefine HAVE_SUITESPARSE_CHOLMOD ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's COLAMD library is available */
-#cmakedefine HAVE_SUITESPARSE_COLAMD ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's CXSPARSE library is available */
-#cmakedefine HAVE_SUITESPARSE_CXSPARSE ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's KLU library is available */
-#cmakedefine HAVE_SUITESPARSE_KLU ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's LDL library is available */
-#cmakedefine HAVE_SUITESPARSE_LDL ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's RBIO library is available */
-#cmakedefine HAVE_SUITESPARSE_RBIO ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's SPQR library is available
-   and if it's version is at least 4.3 */
-#cmakedefine HAVE_SUITESPARSE_SPQR ENABLE_SUITESPARSE
-
-/* Define to ENABLE_SUITESPARSE if the SuiteSparse's UMFPACK library is available */
-#cmakedefine HAVE_SUITESPARSE_UMFPACK ENABLE_SUITESPARSE
-
 /* Define to 1 if METIS is available */
 #cmakedefine HAVE_METIS 1
 
@@ -165,9 +110,6 @@
 /* Define to 1 if the PTScotch replacement for ParMETIS is used. */
 #cmakedefine HAVE_PTSCOTCH_PARMETIS 1
 
-/* Define to 1 if PT-Scotch is available */
-#cmakedefine HAVE_PTSCOTCH 1
-
 /* Used to call lapack functions */
 #cmakedefine LAPACK_NEEDS_UNDERLINE