[Merge][CMake] Merged revisions : 6671

Revision  r6671
.----------------------
Search for doxygen cmake scripts in installed dune-common.

.----------------------


[[Imported from SVN: r7198]]

DuneCommonConfig.cmake.in

@@ -13,4 +13,6 @@ 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@")
-set(@DUNE_MOD_NAME_UPPERCASE@_LIBS "dunecommon")
\ No newline at end of file
+set(@DUNE_MOD_NAME_UPPERCASE@_LIBS "dunecommon")
+set(@DUNE_MOD_NAME_UPPERCASE@_SCRIPT_DIR "${_prefix}/share/cmake/scripts")
+set(DOXYSTYLE_FILE "${_prefix}/share/dune-common/doc/doxygen/Doxystyle")
\ No newline at end of file

cmake/modules/DuneDoxygen.cmake

@@ -13,7 +13,7 @@ add_custom_target(doxygen_install)
 # prepare_doxyfile()
 # This functions adds the necessary routines for the generation of the Doxyfile[.in] files needed to doxygen.
 MACRO (prepare_doxyfile)
-  set(make_doxyfile_command ${CMAKE_COMMAND} -D DOT_TRUE=${DOT_TRUE} -D DUNEWEB_TRUE=\# -D DUNE_MOD_NAME=${DUNE_MOD_NAME} -D DUNE_MOD_VERSION=${DUNE_MOD_VERSION} -D DOXYSTYLE=${CMAKE_CURRENT_SOURCE_DIR}/Doxystyle  -D DOXYLOCAL=${CMAKE_CURRENT_SOURCE_DIR}/Doxylocal -D abs_top_srcdir=${CMAKE_SOURCE_DIR} -D srcdir=${CMAKE_CURRENT_SOURCE_DIR} -D top_srcdir=${CMAKE_SOURCE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateDoxyFile.cmake)
+  set(make_doxyfile_command ${CMAKE_COMMAND} -D DOT_TRUE=${DOT_TRUE} -D DUNEWEB_TRUE=\# -D DUNE_MOD_NAME=${DUNE_MOD_NAME} -D DUNE_MOD_VERSION=${DUNE_MOD_VERSION} -D DOXYSTYLE=${DOXYSTYLE_FILE}  -D DOXYLOCAL=${CMAKE_CURRENT_SOURCE_DIR}/Doxylocal -D abs_top_srcdir=${CMAKE_SOURCE_DIR} -D srcdir=${CMAKE_CURRENT_SOURCE_DIR} -D top_srcdir=${CMAKE_SOURCE_DIR} -P ${SCRIPT_DIR}/CreateDoxyFile.cmake)
   add_custom_command (OUTPUT Doxyfile.in Doxyfile
     COMMAND ${make_doxyfile_command} COMMENT "Creating Doxyfile.in")
   add_custom_target(Doxyfile DEPENDS Doxyfile.in Doxyfile)
@@ -28,11 +28,17 @@ ENDMACRO (prepare_doxyfile)
 # that make sure it is built before running make install.
 MACRO (add_doxygen_target)
   if(DOXYGEN_FOUND)
+    if("${CMAKE_PROJECT_NAME}" STREQUAL "dune-common")
+      set(SCRIPT_DIR ${CMAKE_SOURCE_DIR}/cmake/scripts)
+      set(DOXYSTYLE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Doxystyle)
+    else("${CMAKE_PROJECT_NAME}" STREQUAL "dune-common")
+      set(SCRIPT_DIR ${DUNE_COMMON_SCRIPT_DIR})
+    endif("${CMAKE_PROJECT_NAME}" STREQUAL "dune-common")
     prepare_doxyfile()
     # A custom command that exectutes doxygen
     add_custom_command(OUTPUT html COMMAND
       #${DOXYGEN_EXECUTABLE} Doxyfile
-      ${CMAKE_COMMAND} -D DOXYGEN_EXECUTABLE=${DOXYGEN_EXECUTABLE} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/RunDoxygen.cmake
+      ${CMAKE_COMMAND} -D DOXYGEN_EXECUTABLE=${DOXYGEN_EXECUTABLE} -P ${SCRIPT_DIR}/RunDoxygen.cmake
       COMMENT "Running doxygen documentation. This may take a while"
       DEPENDS Doxyfile)
     # Create a target for building the doxygen documentation of a module,