Fix doxygen table generation

diff --git a/buildtools/Cmake/GenerateDevGuide.cmake b/buildtools/Cmake/GenerateDevGuide.cmake
index 720cc85..aecd8dd 100644 (file)
--- a/buildtools/Cmake/GenerateDevGuide.cmake
+++ b/buildtools/Cmake/GenerateDevGuide.cmake
@@ -13,12 +13,13 @@ if(DOXYGEN_PATH)
     COMMENT "Generating the SimGrid dev guide..."
     DEPENDS ${DEV_GUIDE_SOURCES}
     COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html
     COMMENT "Generating the SimGrid dev guide..."
     DEPENDS ${DEV_GUIDE_SOURCES}
     COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html

-    COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/latex
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/shared/doxygen/simgriddevguide.tag
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html

     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html/
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html/

-    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/

     )
     )

-    
- foreach(file ${DOC_FIGS})
+       
+  foreach(file ${DOC_FIGS})

     string(REPLACE ".fig" ".png" tmp_file ${file})
     string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html/" tmp_file ${tmp_file})
     ADD_CUSTOM_COMMAND(TARGET dev_guide
     string(REPLACE ".fig" ".png" tmp_file ${file})
     string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html/" tmp_file ${tmp_file})
     ADD_CUSTOM_COMMAND(TARGET dev_guide


@@ -34,14 +35,10 @@ if(DOXYGEN_PATH)
     
   ADD_CUSTOM_COMMAND(TARGET dev_guide
     COMMAND ${CMAKE_COMMAND} -E echo "XX First Doxygen pass"
     
   ADD_CUSTOM_COMMAND(TARGET dev_guide
     COMMAND ${CMAKE_COMMAND} -E echo "XX First Doxygen pass"

-    COMMAND ${DOXYGEN_PATH}/doxygen DevGuideDoxyfile
+    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/doxygen/ doxygen ./DevGuideDoxyfile

 
     COMMAND ${CMAKE_COMMAND} -E echo "XX Second Doxygen pass"
 
     COMMAND ${CMAKE_COMMAND} -E echo "XX Second Doxygen pass"

-    COMMAND ${DOXYGEN_PATH}/doxygen DevGuideDoxyfile
-
-    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/html/dir*
-
-    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/doxygen
+    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/doxygen/ doxygen ./DevGuideDoxyfile

     )
 
 else()
     )
 
 else()

diff --git a/doc/dev_guide/doxygen/DevGuideDoxyfile.in b/doc/dev_guide/doxygen/DevGuideDoxyfile.in
index 003dd44..1314e51 100644 (file)
--- a/doc/dev_guide/doxygen/DevGuideDoxyfile.in
+++ b/doc/dev_guide/doxygen/DevGuideDoxyfile.in
@@ -661,8 +661,8 @@ WARN_LOGFILE           =
 INPUT                  = index.doc \
                          simgrid.doc \
                          xps.doc \
 INPUT                  = index.doc \
                          simgrid.doc \
                          xps.doc \

-                         cmake.doc
-
+                         cmake.doc 
+                         

 ###################################################
 ##  PLEASE DON'T MESS WITH THE ORDER OF EXAMPLES ## (unless you know what you are doing, of course)
 ###################################################
 ###################################################
 ##  PLEASE DON'T MESS WITH THE ORDER OF EXAMPLES ## (unless you know what you are doing, of course)
 ###################################################


@@ -1560,7 +1560,7 @@ SKIP_FUNCTION_MACROS   = YES
 # NOT include the path). If a tag file is not located in the directory in which
 # doxygen is run, you must also specify the path to the tagfile here.
 
 # NOT include the path). If a tag file is not located in the directory in which
 # doxygen is run, you must also specify the path to the tagfile here.
 

-TAGFILES               = @CMAKE_HOME_DIRECTORY@/doc/shared/doxygen/simgriddevguide.tag
+TAGFILES               =

 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.