no need to declare twice the list of files that must be copied into the documentation

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 4855598..df7be24 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -507,7 +507,6 @@ set(DOC_SOURCES
   doc/simix.fig
   doc/surf_nutshell.fig
   doc/Doxyfile.in
   doc/simix.fig
   doc/surf_nutshell.fig
   doc/Doxyfile.in

-  doc/simgrid.css

   doc/Layout.xml
   doc/triva-graph_configuration.png
   doc/triva-graph_visualization.png
   doc/Layout.xml
   doc/triva-graph_configuration.png
   doc/triva-graph_visualization.png


@@ -549,18 +548,15 @@ set(DOC_FIGS
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
   )
   
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
   )
   

-set(DOC_SHARED_TAG
-  doc/shared/doxygen/simgridrefguide.tag
-  )
-  

 set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl
   tools/doxygen/xbt_log_extract_hierarchy.pl
   )
 
 set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl
   tools/doxygen/xbt_log_extract_hierarchy.pl
   )
 

-
+# these files get copied automatically to the html documentation

 set(DOC_IMG
 set(DOC_IMG

+${CMAKE_HOME_DIRECTORY}/doc/simgrid.css

 ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
 ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
 ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg
 ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
 ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
 ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg


@@ -579,6 +575,7 @@ ${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
 ${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

+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_modules.png

 )
 
 set(bin_files
 )
 
 set(bin_files

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 9c56f37..ee677da 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -32,20 +32,7 @@ if(DOXYGEN_PATH)
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
     )
     
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
     )
     

-  foreach(file 
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_modules.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
-    ${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
-    ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css 
-    )
-
+  foreach(file ${DOC_IMG})

     ADD_CUSTOM_COMMAND(
       TARGET simgrid_documentation
       COMMAND ${CMAKE_COMMAND} -E copy ${file} ${CMAKE_HOME_DIRECTORY}/doc/html/
     ADD_CUSTOM_COMMAND(
       TARGET simgrid_documentation
       COMMAND ${CMAKE_COMMAND} -E copy ${file} ${CMAKE_HOME_DIRECTORY}/doc/html/