X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d648f085e8892d2d240cc62e38981df1c46e070d..863aeead864a309c494893a1b06ec33ed2b7daf1:/tools/cmake/Documentation.cmake

diff --git a/tools/cmake/Documentation.cmake b/tools/cmake/Documentation.cmake
index 431c28ae32..780d7d2c5e 100644
--- a/tools/cmake/Documentation.cmake
+++ b/tools/cmake/Documentation.cmake
@@ -16,7 +16,7 @@ endif()
 
 find_path(FIG2DEV_PATH  NAMES fig2dev  PATHS NO_DEFAULT_PATHS)
 
-if(DOXYGEN_FOUND)
+if(enable_documentation)
   ADD_CUSTOM_TARGET(documentation 
     COMMENT "Generating the SimGrid documentation..."
     DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen}
@@ -97,7 +97,11 @@ add_custom_target(gforge-sync
   )
 add_dependencies(gforge-sync documentation)
 
-endif() # Doxygen found
+else(enable_documentation)
+  ADD_CUSTOM_TARGET(documentation 
+    COMMENT "The generation of the SimGrid documentation was disabled in cmake"
+    )
+endif(enable_documentation)
 
 if (Java_FOUND)
   find_path(JAVADOC_PATH  NAMES javadoc   PATHS NO_DEFAULT_PATHS)
@@ -118,7 +122,7 @@ endif()
 add_custom_target(manpages ALL
   COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
   COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
-  COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.pl > ${MANPAGE_DIR}/tesh.1
+  COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/doc/manpage/tesh.pod > ${MANPAGE_DIR}/tesh.1
   COMMENT "Generating manpages"
   )
 install(FILES