From d30d6a3017b7d98a428d675a94a71ce92b9f57a7 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 6 Jul 2010 11:50:21 +0000 Subject: [PATCH] Remove doc/html with command make clean. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7973 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 4 ++-- buildtools/Cmake/GenerateDoc.cmake | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d1e64f3f8..246eb5a37a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ endif(WIN32) ### Build the doc if(enable_doc) ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_DIRECTORY}/doc/html/index.html + OUTPUT ${PROJECT_DIRECTORY}/doc/html DEPENDS ${PROJECT_DIRECTORY}/doc/FAQ.doc ${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeLists.txt @@ -103,7 +103,7 @@ if(enable_doc) COMMENT "Generating the simgrid documentation..." ) ADD_CUSTOM_TARGET(simgrid_documentation ALL - DEPENDS ${PROJECT_DIRECTORY}/doc/html/index.html) + DEPENDS ${PROJECT_DIRECTORY}/doc/html) endif(enable_doc) ### Make Simgrid.jar and Java examples diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index b9cffe2cf9..c2c311710b 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -53,8 +53,6 @@ ${PROJECT_DIRECTORY}/doc/fig/amok_bw_sat.fig ${PROJECT_DIRECTORY}/doc/fig/gras_comm.fig ) -string(REPLACE ".fig" ".png\n" LISTE_TROIS ${FIGS}) - set(PNGS ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo.png ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo_small.png -- 2.20.1