From 62977f85b9661de237a3cd2be8a2f76a95ca7b5f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 10 Oct 2016 23:00:15 +0200 Subject: [PATCH 1/1] Re-activate the compilation of the doc. When did it break?? --- CMakeLists.txt | 3 +++ tools/cmake/Documentation.cmake | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d37c886a53..76a32dabdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -895,6 +895,9 @@ endforeach() ### Setup the distrib include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake) +### Build the docs if asked to +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Documentation.cmake) + ### Print the result of configuration message("") message("##########################################") diff --git a/tools/cmake/Documentation.cmake b/tools/cmake/Documentation.cmake index 3b5f6b3d64..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) -- 2.20.1