From 41aeab983aed4105a2868c9339cf1c8df5f35724 Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 17 Jun 2010 09:19:22 +0000 Subject: [PATCH] Generate doc only if it is necessary. Set enable_doc option. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7887 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 42 ++++++++++++++++++++------------ buildtools/Cmake/Option.cmake | 2 +- buildtools/Cmake/PrintArgs.cmake | 3 ++- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33a8d3be9d..66ccec4589 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,17 +30,17 @@ if(WIN32) foreach(include_dir ${INCLUDES_MORE}) set(INCLUDES "${INCLUDES} -I\"${include_dir}\"") endforeach(include_dir ${INCLUDES_MORE}) - message(" Be sure all those variables are correctely set.") - message(" -- C_COMPILER $ENV{CC}") - message(" -- CXX_COMPILER $ENV{CXX}") - message(" -- RC_COMPILER $ENV{RC}") - message(" -- INCLUDE $ENV{INCLUDE}") - message(" -- LIB $ENV{LIB}") - message(" -- MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}") - message(" -- CMAKE_BUILD_TOOL ${CMAKE_BUILD_TOOL}") - message(" -- LINKER ${CMAKE_LINKER}") - message(" -- CMAKE_GENERATOR ${CMAKE_GENERATOR}") - message(" -- INCLUDES ${INCLUDES}\n\n") + message("Be sure all those variables are correctely set.") + message(" -- C_COMPILER $ENV{CC}") + message(" -- CXX_COMPILER $ENV{CXX}") + message(" -- RC_COMPILER $ENV{RC}") + message(" -- INCLUDE $ENV{INCLUDE}") + message(" -- LIB $ENV{LIB}") + message(" -- MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}") + message(" -- CMAKE_BUILD_TOOL ${CMAKE_BUILD_TOOL}") + message(" -- LINKER ${CMAKE_LINKER}") + message(" -- CMAKE_GENERATOR ${CMAKE_GENERATOR}") + message(" -- INCLUDES ${INCLUDES}\n\n") set(__STRICT_ANSI__ 1) set(_MSC_VER 1) set(_WIN32 1) @@ -61,6 +61,7 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/CompleteInFiles.cmake) ### Define source packages for Libs include(${PROJECT_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake) +### Build some Maintainer files include(${PROJECT_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake) ### Setup gcc flags @@ -69,16 +70,25 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/Flags.cmake) ### Make Libs and Exes include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake) +### Build the doc +if(enable_doc) + ADD_CUSTOM_COMMAND( + OUTPUT ${PROJECT_DIRECTORY}/doc/html/index.html + DEPENDS ${PROJECT_DIRECTORY}/doc/FAQ.doc + ${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake + ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeLists.txt + COMMAND ${CMAKE_MAKE_PROGRAM} html + COMMENT "Generating the simgrid documentation..." + ) + ADD_CUSTOM_TARGET(simgrid_documentation ALL + DEPENDS ${PROJECT_DIRECTORY}/doc/html/index.html) +endif(enable_doc) + ### Make Simgrid.jar and Java examples if(HAVE_JAVA) include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeJava.cmake) endif(HAVE_JAVA) -### Build the doc -if(NOT WIN32) -include(${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake) -endif(NOT WIN32) - ### Make tests include(${PROJECT_DIRECTORY}/buildtools/Cmake/AddTests.cmake) include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake) diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index 2177b3fccb..4a073949bd 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -25,7 +25,7 @@ option(enable_gtnets "This variable set the gtnets context." on) option(enable_java "This variable set the java context." off) option(enable_lua "This variable set lua use." on) option(enable_ruby "This variable set ruby use." on) - +option(enable_doc "Setting true this variable enable making the simgrid documentation." off) option(enable_compile_optimizations "" off) option(enable_compile_warnings "" off) option(enable_maintainer_mode "Permit to make flex and flexml files." off) diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake index 61f7848e9f..cdecf799ea 100644 --- a/buildtools/Cmake/PrintArgs.cmake +++ b/buildtools/Cmake/PrintArgs.cmake @@ -142,12 +142,13 @@ message(" Gtnets path : ${gtnets_path}") message(" Compile Java : ${HAVE_JAVA}") message(" Compile Lua : ${HAVE_LUA}") message(" Compile Ruby : ${HAVE_RUBY}") -message("") message(" Compile Smpi : ${enable_smpi}") +message("") message(" Maintainer mode: ${enable_maintainer_mode}") message(" Supernovae mode: ${enable_supernovae}") message(" Tracing mode : ${enable_tracing}") message(" Model checking : ${enable_model-checking}") +message(" Build SG doc : ${enable_doc}") message("") message(" Simgrid dependencies: ${SIMGRID_DEP}") message(" Gras dependencies : ${GRAS_DEP}") -- 2.20.1