From 9beaaae7c5d978cba26886f46aace0417b7a59f4 Mon Sep 17 00:00:00 2001 From: alegrand Date: Wed, 1 Dec 2010 13:05:10 +0000 Subject: [PATCH] Fix the map/png generation for the documentation. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8802 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/GenerateDoc.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index 1b3f09e3b1..f4d37a8ee5 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -58,8 +58,8 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/doc/html COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/doc/html - COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig |perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/ ${PROJECT_DIRECTORY}/doc/simgrid_modules.map - + COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/ ${PROJECT_DIRECTORY}/doc/simgrid_modules.map + WORKING_DIRECTORY ${PROJECT_DIRECTORY}/doc ) @@ -71,13 +71,13 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV WORKING_DIRECTORY ${PROJECT_DIRECTORY} ) - foreach(file ${FIGS}) + foreach(file ${DOC_FIGS}) string(REPLACE ".fig" ".png" tmp_file ${file}) string(REPLACE "${PROJECT_DIRECTORY}/doc/fig/" "${PROJECT_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 ${file} ${tmp_file} ) - endforeach(file ${FIGS}) + endforeach(file ${DOC_FIGS}) ADD_CUSTOM_COMMAND(TARGET simgrid_documentation -- 2.20.1