1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
|
---
buildtools/Cmake/GenerateDoc.cmake | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
Index: b/buildtools/Cmake/GenerateDoc.cmake
===================================================================
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -1,11 +1,11 @@
#### Generate the whole html documentation
-find_path(DOXYGEN_PATH NAMES doxygen PATHS NO_DEFAULT_PATHS)
-find_path(JAVADOC_PATH NAMES javadoc PATHS NO_DEFAULT_PATHS)
+find_package(Doxygen)
+find_path(JAVADOC_PATH NAMES javadoc PATHS NO_DEFAULT_PATHS)
find_path(FIG2DEV_PATH NAMES fig2dev PATHS NO_DEFAULT_PATHS)
mark_as_advanced(JAVADOC_PATH)
-if(DOXYGEN_PATH)
+if(DOXYGEN_FOUND)
ADD_CUSTOM_TARGET(simgrid_documentation
COMMENT "Generating the SimGrid documentation..."
@@ -14,13 +14,14 @@ if(DOXYGEN_PATH)
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/doc/html
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
)
+
+ add_dependencies(simgrid simgrid_documentation)
- execute_process(COMMAND ${DOXYGEN_PATH}/doxygen --version OUTPUT_VARIABLE DOXYGEN_VERSION )
- message(STATUS "Doxygen version: ${DOXYGEN_VERSION}")
+ execute_process(COMMAND ${DOXYGEN_EXECUTABLE} --version OUTPUT_VARIABLE DOXYGEN_VERSION)
if(DOXYGEN_VERSION VERSION_LESS "1.8")
ADD_CUSTOM_TARGET(error_doxygen
- COMMAND ${CMAKE_COMMAND} -E echo "Doxygen must be at least version 1.8 to generate documentation"
+ COMMAND ${CMAKE_COMMAND} -E echo "Doxygen must be at least version 1.8 to generate documentation but it is version ${DOXYGEN_VERSION}"
COMMAND false
)
@@ -49,13 +50,13 @@ if(DOXYGEN_PATH)
COMMAND pwd
COMMAND ${CMAKE_COMMAND} -E tar czf html/msg-tuto-src.tgz msg-tuto-src/
COMMAND ${CMAKE_COMMAND} -E echo "XX Run doxygen"
- COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile
+ COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
COMMAND ${CMAKE_COMMAND} -E echo "XX Generate the index files"
COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/index_create.pl simgrid.tag index-API.doc
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/doxygen/logcategories.doc
COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${CMAKE_HOME_DIRECTORY}/doc/doxygen/logcategories.doc
COMMAND ${CMAKE_COMMAND} -E echo "XX Run doxygen again"
- COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile
+ COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/simgrid_modules.map
COMMAND ${CMAKE_COMMAND} -E echo "XX Javadoc pass"
COMMAND ${JAVADOC_PATH}/javadoc -quiet -d ${CMAKE_HOME_DIRECTORY}/doc/html/javadoc/ ${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/*.java ${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/*/*.java
@@ -73,7 +74,7 @@ if(DOXYGEN_PATH)
COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_HOME_DIRECTORY}/doc/latex/refman.pdf ${CMAKE_HOME_DIRECTORY}/doc/latex/simgrid_documentation.pdf
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/latex/
)
- add_dependencies(pdf simgrid_documentation)
+# add_dependencies(pdf simgrid_documentation)
endif()
|