X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39ddae4cb8b1a4b35c8c9b8c30532e5fa96b2e0d..8e2c9b77d0141688fc7b8be6435b78ed469597c3:/buildtools/Cmake/GenerateDevGuide.cmake

diff --git a/buildtools/Cmake/GenerateDevGuide.cmake b/buildtools/Cmake/GenerateDevGuide.cmake
index e20f2890ad..aecd8ddd09 100644
--- 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
-    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/
-    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
@@ -34,18 +35,13 @@ if(DOXYGEN_PATH)
     
   ADD_CUSTOM_COMMAND(TARGET dev_guide
     COMMAND ${CMAKE_COMMAND} -E echo "XX First Doxygen pass"
-    COMMAND ${DOXYGEN_PATH}/doxygen DevGuideDoxyfile
-    COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/index_create.pl ../../shared/doxygen/simgriddevguide.tag index-API.doc
+    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_HOME_DIRECTORY}/doc/dev_guide/doxygen/ doxygen ./DevGuideDoxyfile
 
     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(DOXYGEN_PATH)
+else()
 
   ADD_CUSTOM_TARGET(dev_guide
     COMMENT "Generating the SimGrid documentation..."
@@ -58,6 +54,6 @@ else(DOXYGEN_PATH)
     COMMAND false
     )
 
-endif(DOXYGEN_PATH)
+endif()
 
 ##############################################################################"