X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a25b8089e4305ec691c460487a77e5c1d07aeb8..63a42d009b40cf8bc11338a13b396efb76ab38cb:/buildtools/Cmake/GenerateDoc.cmake

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 59132b5b84..c61d7ef0dc 100644
--- 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)
@@ -69,7 +69,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
 		string(REPLACE ".fig" ".png" tmp_file ${file})
 		string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/fig/" "${CMAKE_HOME_DIRECTORY}/doc/html/" tmp_file ${tmp_file})
 		ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
-			COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng ${file} ${tmp_file}
+			COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng -S 4 ${file} ${tmp_file}
 		)
 	endforeach(file ${DOC_FIGS})