Completed adaptation of duneproject. It now creates a complete

infrastructure to use the module with cmake. Currently, only an installed dune-common can be used, as the others lack the cmake confguration files. One has to provide the CMAKE_MODULE_PATH pointing to the directory where e.g. DuneMacros.cmake is installed (PREFIX/share/cmake/modules) and DuneCommon_DIR pointing to PREFIXlib/cmake. The ${CMAKE_BINARY_DIR}/config.h.cmake of the project is created such that it includes section from modules that it depends on as well as the ${CMAKE_SOURCE_DIR}/config.h.cmake. This prevents user from creating a full file by hand. Renamed package configuration files according to the style of the other modules. [[Imported from SVN: r6661]]

Completed adaptation of duneproject. It now creates a complete
3c418763 · Markus Blatt · 92a445f7 · 3c418763 · 3c418763 · 3c418763
Commit 3c418763 authored 12 years ago by Markus Blatt
--- a/DuneCommonConfig.cmake.in
+++ b/DuneCommonConfig.cmake.in
+#compute installation prefix relative to this file
+get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_prefix "${_dir}/../.." ABSOLUTE)
+
+#import the target
+include("${_prefix}/lib/cmake/@DUNE_MOD_NAME_CMAKE@Targets.cmake")
+
+#report other information
+set(@DUNE_MOD_NAME_UPPERCASE@_PREFIX "${_prefix}")
+set(@DUNE_MOD_NAME_UPPERCASE@_INCLUDE_DIRS "${_prefix}/include")
+set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
+set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
+set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
+set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
+set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
\ No newline at end of file
--- a/dune-common-version.cmake.in
+++ b/dune-common-version.cmake.in
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -457,37 +457,30 @@ include \$(top_srcdir)/am/global-rules

 M_DELIM

-for i in $DEPENDENCIES; do
-    echo "find_packages($i)" >>$PROJECT/dependencies.cmake
-    echo "include_directories(\${$i_INCLUDE_DIRS})" >>$PROJECT/dependencies.cmake
-done
-echo "include_directories("${CMAKE_SOURCE_DIR}")"  >>$PROJECT/dependencies.cmake
-
+################## CMakeLists.txt ##################
 echo " - $PROJECT/CMakeLists.txt"
 cat> "$PROJECT/CMakeLists.txt" << M_DELIM
 cmake_minimum_required(VERSION 2.8)
 project($PROJECT CXX)
-include(dependencies.cmake)

 # for this tow work you will have to modify the CMAKE_MODULE_PATH
-#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../dune-common/cmake/modules")
+#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")

+#include the dune macros
 include(DuneMacros)

-include(DUNEDoc)
-
-#activate testing
-include(DuneTest)
-
-#activate pkg-config
-include(DunePkgConfig)
+# start a dune project with information from dune.module
+dune_project()

 add_subdirectory("src")
 add_subdirectory("m4")
 add_subdirectory("dune")
 add_subdirectory("doc")

+# finalize the dune project, e.g. generating config.h etc.
+finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
 M_DELIM
+
 ################## STAMP-VC ##################
 echo "- $PROJECT/stamp-vc"
 echo 'A stamp file to signify that this directory comes from a version control system, not an unpacked tarball' > $PROJECT/stamp-vc
@@ -520,6 +513,16 @@ echo "    Description and URL are missing right now."

 mkdir "$PROJECT/src"

+################## src/CMakeLists.txt ##################
+
+echo "- $PROJECT/src/CMakeLists.txt"
+cat> "$PROJECT/src/CMakeLists.txt" << M_DELIM
+
+add_executable("${CMODULE}" ${CMODULE}.cc)
+target_link_dune_default_libraries("${CMODULE}")
+
+M_DELIM
+
 ################## src/MAKEFILE.AM ##################

 echo "- $PROJECT/src/Makefile.am"
@@ -614,6 +617,14 @@ EXTRA_DIST = \$(M4FILES)
 include \$(top_srcdir)/am/global-rules
 CC_DELIM

+
+echo "- $PROJECT/m4/CMakeLists.txt"
+cat> "$PROJECT/m4/CMakeLists.txt" << CC_DELIM
+
+install(PROGRAMS $MODULE.m4 DESTINATION share/aclocal)
+
+CC_DELIM
+
 ################## M4/PROJECT.M4 ####################
 M4_MODULE=`echo $MODULE | tr '[a-z-]' '[A-Z_]'`
 echo "- $PROJECT/m4/$MODULE.m4"
@@ -654,6 +665,12 @@ SUBDIRS = $NAME
 include \$(top_srcdir)/am/global-rules
 EOF

+echo "- $PROJECT/dune/CMakeLists.txt"
+cat> $PROJECT/dune/CMakeLists.txt <<EOF
+add_subdirectory($NAME)
+EOF
+
+
 ################## dune/$NAME/Makefile.am ##############
 echo "- $PROJECT/dune/$NAME/Makefile.am"
 cat> $PROJECT/dune/$NAME/Makefile.am <<EOF
@@ -663,6 +680,13 @@ ${NAME}include_HEADERS = ${NAME}.hh
 include \$(top_srcdir)/am/global-rules
 EOF

+echo "- $PROJECT/dune/$NAME/CMakeLists.txt"
+cat> $PROJECT/dune/$NAME/CMakeLists.txt <<EOF
+#install headers
+install(FILES ${NAME}.hh DESTINATION include/dune/$NAME)
+
+EOF
+
 ################## dune/$NAME/$NAME.hh #################
 echo "- $PROJECT/dune/$NAME/$NAME.hh"
 cat> $PROJECT/dune/$NAME/$NAME.hh <<EOF
@@ -698,6 +722,12 @@ include \$(top_srcdir)/am/webstuff
 include \$(top_srcdir)/am/global-rules
 CC_DELIM

+
+echo "- $PROJECT/doc/CMakeLists.txt"
+cat> "$PROJECT/doc/CMakeLists.txt" << CC_DELIM
+add_subdirectory("doxygen")
+CC_DELIM
+
 ###############################################################
 ############### The doc/doxygen subdirectory ##################
 ###############################################################
@@ -759,7 +789,89 @@ include \$(top_srcdir)/am/global-rules

 CC_DELIM

+
+echo "- $PROJECT/doc/doxygen/CMakeLists.txt"
+cat> "$PROJECT/doc/doxygen/CMakeLists.txt" << CC_DELIM
+# shortcut for creating the Doxyfile.in and Doxyfile
+add_doxygen_target()
+
+# install doxygen documentation
+install(FILES Doxystyle DESTINATION share/$NAME/doc/doxygen)
+CC_DELIM
+
+echo "- $PROJECT/config.h.cmake"
+cat> "$PROJECT/config.h.cmake" <<EOF
+/* begin $NAME
+   put the definitions for config.h specific to
+   your project here. Everything above will be
+   overwritten 
+*/
+
+/* begin private */
+/* Name of package */
+#define PACKAGE "@DUNE_MOD_NAME"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "@DUNE_MAINTAINER@"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "@DUNE_MOD_NAME@"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "@DUNE_MOD_NAME@ @DUNE_MOD_VERSION@"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "@DUNE_MOD_NAME@"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "@DUNE_MOD_URL@"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "@DUNE_MOD_VERSION@"
+
+/* end private */
+
+/* end $NAME
+   Everything below here will be overwritten
+*/
+EOF
 ## done
+
+CMAKE_NAME=`echo $NAME | sed "s/^\\(\\w\\)/\\U\\1/
+s/[_-]\\(\\w\)/\\U\\1/g"`
+
+echo "- $PROJECT/$CMAKE_NAME""Config.cmake.in"
+cat> "$PROJECT/$CMAKE_NAME""Config.cmake.in" <<EOF
+#compute installation prefix relative to this file
+get_filename_component(_dir "\${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_prefix "\${_dir}/../.." ABSOLUTE)
+
+#import the target
+#include("\${_prefix}/lib/cmake/@DUNE_MOD_NAME@-targets.cmake")
+
+#report other information
+set(@DUNE_MOD_NAME@_INCLUDE_DIRS "\${_prefix}/include")
+set(@DUNE_MOD_NAME@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
+EOF
+
+echo "- $PROJECT/$CMAKE_NAME""Version.cmake.in"
+cat> "$PROJECT/$CMAKE_NAME""Version.cmake.in" <<EOF
+set(PACKAGE_VERSION "@DUNE_MOD_VERSION@")
+
+if(NOT "\${PACKAGE_FIND_VERSION}" VERSION_GREATER "@DUNE_MOD_VERSION@")
+  set (PACKAGE_VERSION_COMPATIBLE 1) # compatible with older
+  if ("\${PACKAGE_FIND_VERSION}" VERSION_EQUAL "@DUNE_MOD_VERSION@")
+    set(PACKAGE_VERSION_EXACT 1) #exact match for this version
+  endif()
+endif()
+EOF
+echo "- $PROJECT/stamp-regenerate-config-h"
+touch $PROJECT/stamp-regenerate-config-h
+echo 
 echo "done."
 echo "------------------------------------------"
 echo "For further details read the Dune Buildsystem-Howto:"

--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
+MACRO(dune_module_to_uppercase _upper _module)
+  string(TOUPPER "${_module}" ${_upper})
+  string(REPLACE "-" "_" ${_upper} "${${_upper}}")
+ENDMACRO(dune_module_to_uppercase _upper _module)
+
 # add dune-common version from dune.module to config.h
 macro(dune_module_information MODULE_DIR)
  file(READ "${MODULE_DIR}/dune.module" DUNE_MODULE)
@@ -8,7 +13,7 @@ macro(dune_module_information MODULE_DIR)
    message("${MODULE_DIR}/dune.module is missing a version." FATAL_ERROR)
  endif(NOT MODULE_LINE)

-  string(REGEX REPLACE ".*Version:[ ]*([^ \n]+).*" "\\1" MODULE_LINE "${DUNE_MODULE}")
+  string(REGEX REPLACE ".*Version:[ ]*([^ \n]+).*" "\\1" DUNE_MOD_VERSION "${MODULE_LINE}")
  string(REGEX REPLACE "([0-9]).*" "\\1" DUNE_VERSION_MAJOR "${DUNE_MOD_VERSION}")
  string(REGEX REPLACE "[0-9]*\\.([0-9]).*" "\\1" DUNE_VERSION_MINOR "${DUNE_MOD_VERSION}")
  string(REGEX REPLACE "[0-9]*\\.[0-9]*\\.([0-9]).*" "\\1" DUNE_VERSION_REVISION "${DUNE_MOD_VERSION}")
@@ -47,18 +52,45 @@ macro(dune_module_information MODULE_DIR)

  # extract dependencies if the line exists.
  if(MODULE_LINE)
-    string(REGEX REPLACE ".*Depends:[ ]*([^ \n]+).*" "\\1" DUNE_DEPENDS "${DUNE_MODULE}")
+    string(REGEX REPLACE ".*Depends:[ ]*([^ \n]+).*" "\\1" DUNE_DEPENDS "${MODULE_LINE}")
  endif(MODULE_LINE)

+  dune_module_to_uppercase(DUNE_MOD_NAME_UPPERCASE ${DUNE_MOD_NAME})
+  message("DUNE_MOD_NAME_UPPERCASE=${DUNE_MOD_NAME_UPPERCASE}")
  # set module version
-  set("${DUNE_MOD_NAME}_VERSION"          "${DUNE_MOD_VERSION}")
-  set("${DUNE_MOD_NAME}_VERSION_MAJOR"    "${DUNE_VERSION_MAJOR}")
-  set("${DUNE_MOD_NAME}_VERSION_MINOR"    "${DUNE_VERSION_MINOR}")
-  set("${DUNE_MOD_NAME}_VERSION_REVISION" "${DUNE_VERSION_REVISION}")
-
-  #foreach( module $DEPENDENCIES
+  set(${DUNE_MOD_NAME_UPPERCASE}_VERSION         "${DUNE_MOD_VERSION}")
+  set(${DUNE_MOD_NAME_UPPERCASE}_VERSION_MAJOR    "${DUNE_VERSION_MAJOR}")
+  set(${DUNE_MOD_NAME_UPPERCASE}_VERSION_MINOR    "${DUNE_VERSION_MINOR}")
+  set(${DUNE_MOD_NAME_UPPERCASE}_VERSION_REVISION "${DUNE_VERSION_REVISION}")
 endmacro(dune_module_information)

+MACRO(dune_create_dependency_tree)
+  # TODO Create full dependency tree from ${DEPENDENCIES}
+  set(DEPENDENCY_TREE ${DUNE_DEPENDS})
+ENDMACRO(dune_create_dependency_tree _immediates)
+
+macro(dune_module_to_macro _macro_name _dune_module)
+  set(${_macro_name} "")
+  set(_rest "${_dune_module}")
+  string(FIND "${_rest}" "-" _found)
+  while(_found GREATER -1)
+    string(REGEX REPLACE "([^-]*)-.*" "\\1" _first_part
+      "${_rest}")
+    string(REGEX REPLACE "[^-]*-(.*)" "\\1" _rest
+      "${_rest}")
+    string(SUBSTRING "${_first_part}" 0 1 _first_letter)
+    string(SUBSTRING "${_first_part}" 1 -1 _rest_first_part)
+    string(TOUPPER "${_first_letter}" _first_letter)
+    set(${_macro_name} "${${_macro_name}}${_first_letter}${_rest_first_part}")
+    string(FIND "${_rest}" "-" _found)
+  endwhile(_found GREATER -1)
+  string(LENGTH "${_rest}" _length)
+  string(SUBSTRING "${_rest}" 0 1 _first_letter)
+  string(SUBSTRING "${_rest}" 1 -1 _rest)
+  string(TOUPPER "${_first_letter}" _first_letter)
+  set(${_macro_name} "${${_macro_name}}${_first_letter}${_rest}")
+endmacro(dune_module_to_macro _macro_name _dune_module)
+
 macro(dune_project)

  # Set the flags
@@ -146,38 +178,122 @@ macro(dune_project)
  # activate pkg-config
  include(DunePkgConfig)

+  dune_create_dependency_tree()
+
+  message("DEPENDENCY_TREE=${DEPENDENCY_TREE}")
+  foreach(_mod ${DEPENDENCY_TREE})
+    # Search for a cmake files containing tests and directives
+    # specific to this module
+    dune_module_to_macro(_cmake_mod_name "${_mod}")
+    set(_macro "${_cmake_mod_name}Macros")
+    find_file(_mod_cmake ${_macro}.cmake ${CMAKE_MODULE_PATH}
+      NO_DEFAULT_PATH)
+    if(_mod_cmake)
+      include(${_mod_cmake})
+    endif(_mod_cmake)
+    # Find the module
+    find_package(${_cmake_mod_name})
+    # set includes
+    dune_module_to_uppercase(_upper_case "${_mod}")
+    message("${_upper_case}_INCLUDE_DIRS")
+    include_directories("${${_upper_case}_INCLUDE_DIRS}")
+  endforeach(_mod DEPENDENCY_TREE)
+
  # Search for a cmake files containing tests and directives
  # specific to this module
-  find_file(_mod_cmake DuneCommonMacros.cmake ${CMAKE_MODULE_PATH}
-    NO_DEFAULT_PATH)
+  dune_module_to_macro(_macro ${DUNE_MOD_NAME})
+  set(DUNE_MOD_NAME_CMAKE "${_macro}")
+  set(_macro "${_macro}Macros")
+  find_file(_mod_cmake ${_macro}.cmake ${CMAKE_MODULE_PATH}
+    ${CMAKE_SOURCE_DIR}/cmake/modules NO_DEFAULT_PATH)
+  message("_mod_cmake=${_mod_cmake}")
  if(_mod_cmake)
-    include(DuneCommonMacros)
+    include(${_mod_cmake})
+  else(_mod_cmake)
+    message("There are no tests for module ${DUNE_MOD_NAME}.")
  endif(_mod_cmake)
 endmacro(dune_project MODULE_DIR)

+MACRO(dune_regenerate_config_cmake)
+  set(CONFIG_H_CMAKE_FILE "${CMAKE_BINARY_DIR}/config.h.cmake")
+  if(EXISTS ${CMAKE_SOURCE_DIR}/config.h.cmake)
+    file(READ ${CMAKE_SOURCE_DIR}/config.h.cmake _file)
+    message("read ${CMAKE_SOURCE_DIR}/config.h.cmake")
+    string(REGEX MATCH
+      "/[\\*/][ ]*begin[ ]+${DUNE_MOD_NAME}.*\\/[/\\*][ ]*end[ ]*${DUNE_MOD_NAME}[^\\*]*\\*/"
+      _tfile "${_file}")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/config.h.cmake)
+  # overwrite file with new content
+  file(WRITE ${CONFIG_H_CMAKE_FILE} "/* config.h.  Generated from config.h.cmake by CMake.
+   It was generated from config.h.cmake which in turn is generated automatically
+   from the config.h.cmake files of modules this module depends on. */"
+   )
+
+ # add previous module specific section
+ file(APPEND ${CONFIG_H_CMAKE_FILE} "\n${_tfile}")
+ foreach(_dep  ${DEPENDENCY_TREE})
+   foreach(_mod_conf_file ${${_dep}_PREFIX}/config.h.cmake
+       ${${_dep}_PREFIX}/share/${_dep}/config.h.cmake)
+     message("_mod_conf_file=${_mod_conf_file}")
+     if(EXISTS ${_mod_conf_file})
+       file(READ "${_mod_conf_file}"  _file)
+       string(REGEX REPLACE
+	 ".*/\\*[ ]*begin[ ]+${_dep}[^\\*]*\\*/(.*)/[/\\*][ ]*end[ ]*${_dep}[^\\*]*\\*/" "\\1"
+	 _tfile "${_file}")
+       # strip the private section
+       string(REGEX REPLACE "(.*)/[\\*][ ]*begin private.*/[\\*][ ]*end[ ]*private[^\\*]\\*/(.*)" "\\1\\2" _file "${_tfile}")
+       file(APPEND ${CONFIG_H_CMAKE_FILE} "${_file}")
+     endif(EXISTS ${_mod_conf_file})
+   endforeach()
+ endforeach(_dep  DEPENDENCY_TREE)
+ENDMACRO(dune_regenerate_config_cmake)
+
 # macro that should be called at the end of the top level CMakeLists.txt.
 # Namely it creates  config.h and the cmake-config files,
 # some install directives and export th module.
 MACRO(finalize_dune_project)
-  # actually write the config.h file to disk
-  configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

  #create cmake-config files
  configure_file(
-    ${PROJECT_SOURCE_DIR}/${DUNE_MOD_NAME}-config.cmake.in
-    ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME}-config.cmake @ONLY)
+    ${PROJECT_SOURCE_DIR}/${DUNE_MOD_NAME_CMAKE}Config.cmake.in
+    ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME_CMAKE}Config.cmake @ONLY)

  configure_file(
-    ${PROJECT_SOURCE_DIR}/${DUNE_MOD_NAME}-version.cmake.in
-    ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME}-version.cmake @ONLY)
+    ${PROJECT_SOURCE_DIR}/${DUNE_MOD_NAME_CMAKE}Version.cmake.in
+    ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME_CMAKE}Version.cmake @ONLY)

  #install dune.module file
  install(FILES dune.module DESTINATION lib/dunecontrol/${DUNE_MOD_NAME})

  #install cmake-config files
-  install(FILES ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME}-config.cmake
-    ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME}-version.cmake
+  install(FILES ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME_CMAKE}Config.cmake
+    ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME_CMAKE}Version.cmake
    DESTINATION lib/cmake)

+  #install config.h
+  install(FILES config.h.cmake DESTINATION share/${DUNE_MOD_NAME})
  export(PACKAGE ${DUNE_MOD_NAME})
+
+  if("${ARGC}" EQUAL "1")
+    message("Adding custom target for config.h generation")
+    dune_regenerate_config_cmake()
+    # add a target to generate config.h.cmake
+    add_custom_target(OUTPUT config.h.cmake
+      COMMAND dune_regenerate_config_cmake()
+      DEPENDS stamp-regenerate-config-h)
+    # actually write the config.h file to disk
+    # using generated file
+    configure_file(${CMAKE_CURRENT_BINARY_DIR}/config.h.cmake
+      ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+  else("${ARGC}" EQUAL "1")
+    message("Not adding custom target for config.h generation")
+    # actually write the config.h file to disk
+    configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+  endif("${ARGC}" EQUAL "1")
 ENDMACRO(finalize_dune_project)
+
+MACRO(target_link_dune_default_libraries _target)
+  add_DUNE_MPI_flags(${_target})
+ENDMACRO(target_link_dune_default_libraries)
+
+
--- a/config.h.cmake
+++ b/config.h.cmake
 /* config.h.  Generated from config.h.cmake by CMake.  */

+/* begin dune-common */
+
 #ifdef DEPRECATED_MPI_CPPFLAGS_USED
 #warning The MPI_CPPFLAGS configure substitute is deprecated. Please change
 #warning your Makefile.am to use DUNEMPICPPFLAGS instead. Note that it is a
@@ -86,6 +88,8 @@
 /* Define to 1 if the MPI2 Standard is supported */
 #cmakedefine MPI_2 1

+/* begin private */
+
 /* Name of package */
 #define PACKAGE "dune-common"

@@ -107,6 +111,11 @@
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "@DUNE_MOD_VERSION@"

+/* Version number of package */
+#define VERSION "@DUNE_MOD_VERSION@"
+
+/* end private */
+
 #cmakedefine HAVE_BOOST 1

 /* The header in which SHARED_PTR can be found */
@@ -115,9 +124,6 @@
 /* The namespace in which SHARED_PTR can be found */
 #cmakedefine SHARED_PTR_NAMESPACE ${SHARED_PTR_NAMESPACE}

-/* Version number of package */
-#define VERSION "@DUNE_MOD_VERSION@"
-
 /* Define to 1 if variadic templates are supported */
 #cmakedefine HAVE_VARIADIC_TEMPLATES 1

@@ -127,8 +133,10 @@
 /* Define to 1 if rvalue references are supported */
 #cmakedefine HAVE_RVALUE_REFERENCES 1

-/* Include allways usefull headers */
+/* Include always useful headers */
 #include <dune/common/deprecated.hh>
 #include <dune/common/unused.hh>
 #include "FC.h"
 #define FC_FUNC FC_GLOBAL_
+
+/* end dune-common */
--- a/dune-common-config.cmake.in
+++ b/dune-common-config.cmake.in
-#compute installation prefix relative to this file
-get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_prefix "${_dir}/../.." ABSOLUTE)
-
-#import the target
-include("${_prefix}/lib/cmake/@DUNE_MOD_NAME@-targets.cmake")
-
-#report other information
-set(@DUNE_MOD_NAME@_INCLUDE_DIRS "${_prefix}/include")
-set(@DUNE_MOD_NAME@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
\ No newline at end of file
--- a/dune/common/CMakeLists.txt
+++ b/dune/common/CMakeLists.txt
@@ -12,8 +12,8 @@ add_library("dunecommon"
 	stdstreams.cc)
 target_link_libraries("dunecommon" ${LAPACK_LIBRARIES})

-install(TARGETS dunecommon  EXPORT dune-common-targets DESTINATION lib)
-install(EXPORT dune-common-targets
+install(TARGETS dunecommon  EXPORT DuneCommonTargets DESTINATION lib)
+install(EXPORT DuneCommonTargets
  DESTINATION lib/cmake)
 # build the library in lib
 set_target_properties(dunecommon PROPERTIES