Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / buildtools / Cmake / GenerateDoc.cmake

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 59132b5..a2739f5 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -27,8 +27,6 @@ endif(${OUTPUT_BIBTEX2HTML_VERSION_2} STREQUAL ${OUTPUT_BIBTEX2HTML_VERSION})
 
 if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSION)
 
-       string(REGEX REPLACE ";.*logcategories.doc" "" LISTE_DEUX "${LISTE_DEUX}")
-
        #DOC_SOURCE=doc/*.doc, defined in DefinePackage
        set(DOCSSOURCES "${source_doxygen}\n${DOC_SOURCE}")
        string(REPLACE "\n" ";" DOCSSOURCES ${DOCSSOURCES})
@@ -43,6 +41,8 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
        )
        
        configure_file(${CMAKE_HOME_DIRECTORY}/doc/Doxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/Doxyfile @ONLY)