Adapt cmake variables, such that we can use dune-common.pc.in

[[Imported from SVN: r6606]]

CMakeLists.txt

@@ -7,11 +7,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
 include(DuneMacros)
 dune_module_information(${CMAKE_SOURCE_DIR})
 
-set(ProjectName            "${DUNE_MODULE_NAME}")
-set(ProjectVersion         "${DUNE_VERSION_STRING}")
+set(ProjectName            "${DUNE_MOD_NAME}")
+set(ProjectVersion         "${DUNE_MOD_VERSION}")
 set(ProjectMaintainerEmail "${DUNE_MAINTAINER}")
 project(${ProjectName} C CXX Fortran)
-set(DUNE_COMMON_VERSION          "${DUNE_VERSION_STRING}")
+set(DUNE_COMMON_VERSION          "${DUNE_MOD_VERSION}")
 set(DUNE_COMMON_VERSION_MAJOR    "${DUNE_VERSION_MAJOR}")
 set(DUNE_COMMON_VERSION_MINOR    "${DUNE_VERSION_MINOR}")
 set(DUNE_COMMON_VERSION_REVISION "${DUNE_VERSION_REVISION}")
@@ -86,18 +86,26 @@ add_subdirectory("doc")
 
 
 set( CMAKE_FIND_LIBRARY_SUFFIXES ${_dune_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+set( prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix "\${prefix}")
+set(libdir "\${exec_prefix}/lib")
+set(includedir "\${prefix}/include")
+set(PACKAGE_NAME ${DUNE_MOD_NAME})
+set(VERSION ${DUNE_MOD_VERSION})
+set(CC ${CMAKE_C_COMPILER})
+set(CXX ${CMAKE_CXX_COMPILER})
 
 configure_file(
-  ${PROJECT_SOURCE_DIR}/${DUNE_MODULE_NAME}.pc.cmake
-  ${PROJECT_BINARY_DIR}/${DUNE_MODULE_NAME}.pc
+  ${PROJECT_SOURCE_DIR}/${DUNE_MOD_NAME}.pc.in
+  ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME}.pc
   @ONLY
 )
 
 #install dune.module file
-install(FILES dune.module DESTINATION lib/dunecontrol/${DUNE_MODULE_NAME})
+install(FILES dune.module DESTINATION lib/dunecontrol/${DUNE_MOD_NAME})
 # install pkgconfig file
 if(PKG_CONFIG_FOUND )
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DUNE_MODULE_NAME}.pc
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DUNE_MOD_NAME}.pc
     DESTINATION lib/pkgconfig)
 endif(PKG_CONFIG_FOUND)
 # set up CTest

cmake/modules/DuneMacros.cmake

@@ -3,10 +3,10 @@ macro(dune_module_information MODULE_DIR)
   file(READ "${MODULE_DIR}/dune.module" DUNE_MODULE)
 
   # find version string
-  string(REGEX REPLACE ".*Version:[ ]*([^ \n]+).*" "\\1" DUNE_VERSION_STRING "${DUNE_MODULE}")
-  string(REGEX REPLACE "([0-9]).*" "\\1" DUNE_VERSION_MAJOR "${DUNE_VERSION_STRING}")
-  string(REGEX REPLACE "[0-9]*\\.([0-9]).*" "\\1" DUNE_VERSION_MINOR "${DUNE_VERSION_STRING}")
-  string(REGEX REPLACE "[0-9]*\\.[0-9]*\\.([0-9]).*" "\\1" DUNE_VERSION_REVISION "${DUNE_VERSION_STRING}")
+  string(REGEX REPLACE ".*Version:[ ]*([^ \n]+).*" "\\1" DUNE_MOD_VERSION "${DUNE_MODULE}")
+  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}")
 
   # remove false matches in version string
   string(REGEX MATCH "[^0-9]" NON_NUMBER_CHARACTER "${DUNE_VERSION_MINOR}")
@@ -19,6 +19,6 @@ macro(dune_module_information MODULE_DIR)
   endif(NON_NUMBER_CHARACTER)
 
   # find strings for module name, maintainer
-  string(REGEX REPLACE ".*Module:[ ]*([^ \n]+).*" "\\1" DUNE_MODULE_NAME "${DUNE_MODULE}")
+  string(REGEX REPLACE ".*Module:[ ]*([^ \n]+).*" "\\1" DUNE_MOD_NAME "${DUNE_MODULE}")
   string(REGEX REPLACE ".*Maintainer:[ ]*([^ \n]+).*" "\\1" DUNE_MAINTAINER "${DUNE_MODULE}")
 endmacro(dune_module_information)

dune-common.pc.cmake

-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
-libdir=@CMAKE_INSTALL_PREFIX@/lib
-includedir=@CMAKE_INSTALL_PREFIX@/include
-CXX=@CMAKE_CXX_COMPILER@
-CC=@CMAKE_C_COMPILER@
-DEPENDENCIES=@REQUIRES@
-
-Name: @DUNE_MODULE_NAME@
-Version: @DUNE_VERSION_STRING@
-Description: Dune (Distributed and Unified Numerics Environment) common module
-URL: http://dune-project.org/
-Requires: ${DEPENDENCIES}
-Libs: -L${libdir} -ldunecommon
-Cflags: -I${includedir}