[certi-cvs] certi/doc DoxyTools.cmake

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      13/01/08 09:45:26

Modified files:
        doc            : DoxyTools.cmake 

Log message:
        Enhance dependencies for doxygen doc generation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/doc/DoxyTools.cmake?cvsroot=certi&r1=3.6&r2=3.7

Patches:
Index: DoxyTools.cmake
===================================================================
RCS file: /sources/certi/certi/doc/DoxyTools.cmake,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -b -r3.6 -r3.7
--- DoxyTools.cmake     14 Sep 2011 20:32:28 -0000      3.6
+++ DoxyTools.cmake     8 Jan 2013 09:45:26 -0000       3.7
@@ -56,10 +56,17 @@
     ENDIF(DoxyTools_VERBOSE)
 
     SET(${DOCSET}_DOC_OUTPUT_DIR ${DoxyTools_OUTPUT_DIR} CACHE PATH "${DOCSET} 
doc output dir")
+    set(OUTPUT_FILES "")
     # Define appropriate doc type generation for Doxygen
+    # and associated output files.
     LIST_CONTAINS(genpdf "pdf" ${DoxyTools_DOC_TYPE})
     IF (genpdf)
        SET(${DOCSET}_DOC_GENERATE_LATEX "YES")
+       SET(OUTPUT_FILE_PDF "${DoxyTools_OUTPUT_DIR}/latex/refman.pdf")
+       SET(OUTPUT_FILE_TEX "${DoxyTools_OUTPUT_DIR}/latex/refman.tex")
+       SET(OUTPUT_FILES "${OUTPUT_FILES} ${OUTPUT_FILE_TEX} 
${OUTPUT_FILE_PDF}")
+       # find pdflatex compiler
+       find_package(LATEX)
     ELSE (genpdf)
        SET(${DOCSET}_DOC_GENERATE_LATEX "NO")
     ENDIF(genpdf)
@@ -67,6 +74,11 @@
     LIST_CONTAINS(genhtml "html" ${DoxyTools_DOC_TYPE})
     IF (genhtml)
        SET(${DOCSET}_DOC_GENERATE_HTML "YES")
+       SET(OUTPUT_FILE_HTML "${DoxyTools_OUTPUT_DIR}/html/index.html")
+       SET(OUTPUT_FILES "${OUTPUT_FILES} ${OUTPUT_FILE_HTML}")
+       FOREACH(arg ${DoxyTools_INPUT_FILES})
+          CONFIGURE_FILE(${arg} ${DoxyTools_OUTPUT_DIR}/html/${arg} COPYONLY)
+       ENDFOREACH(arg)
     ELSE (genhtml)
        SET(${DOCSET}_DOC_GENERATE_HTML "NO")
     ENDIF(genhtml)
@@ -79,46 +91,42 @@
         CONFIGURE_FILE(${DoxyTools_CONFIG_FILE}.in 
${CMAKE_CURRENT_BINARY_DIR}/${DoxyTools_CONFIG_FILE})
     ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${DoxyTools_CONFIG_FILE}.in)
 
-    IF (genhtml)
-       SET(OUTPUT_FILE ${DoxyTools_OUTPUT_DIR}/html/index.html)
-       FOREACH(arg ${DoxyTools_INPUT_FILES})
-          CONFIGURE_FILE(${arg} ${DoxyTools_OUTPUT_DIR}/html/${arg} COPYONLY)
-       ENDFOREACH(arg)
-    ENDIF(genhtml)
-
     # create output directory
     FILE(MAKE_DIRECTORY ${DoxyTools_OUTPUT_DIR})
-    IF(OUTPUT_FILE)
+    IF(OUTPUT_FILES)
+      # Always run doxygen (independently of the targeted output formats)
        ADD_CUSTOM_COMMAND(
-          OUTPUT  ${OUTPUT_FILE}
-          COMMAND ${CMAKE_COMMAND} -E echo_append "Building CERTI ${DOCSET} 
Documentation..."
+          OUTPUT  ${OUTPUT_FILE_HTML} ${OUTPUT_FILE_TEX}
+          COMMAND ${CMAKE_COMMAND} -E echo_append "Building ${DOCSET} 
Documentation..."
           COMMAND ${DOXYGEN_EXECUTABLE} 
${CMAKE_CURRENT_BINARY_DIR}/${DoxyTools_CONFIG_FILE}
           COMMAND ${CMAKE_COMMAND} -E echo "Done."
           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
           DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${DoxyTools_CONFIG_FILE})
-       ADD_CUSTOM_TARGET(${DOCSET}_doc ALL DEPENDS ${OUTPUT_FILE})
-    ENDIF(OUTPUT_FILE)
-
-    ADD_CUSTOM_TARGET(${DOCSET}_doc_forced
-           COMMAND ${CMAKE_COMMAND} -E echo_append "Building CERTI ${DOCSET} 
Documentation..."
-           COMMAND ${DOXYGEN_EXECUTABLE} 
${CMAKE_CURRENT_BINARY_DIR}/${DoxyTools_CONFIG_FILE}
-           COMMAND ${CMAKE_COMMAND} -E echo "Done."
-           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
     # If genpdf was specified AND a pdflatex compiler was found
     # then create a rule for running pdflatex
     IF(genpdf AND PDFLATEX_COMPILER)
-        ADD_CUSTOM_TARGET(${DOCSET}_doc_forced_pdf
-           COMMAND ${CMAKE_COMMAND} -E echo_append "Building CERTI ${DOCSET} 
PDF Documentation..."
+         ADD_CUSTOM_COMMAND(
+           OUTPUT  ${OUTPUT_FILE_PDF}
+           COMMAND ${CMAKE_COMMAND} -E echo_append "Building ${DOCSET} PDF 
Documentation..."
            COMMAND ${PDFLATEX_COMPILER} refman.tex
            COMMAND ${CMAKE_COMMAND} -E echo "Done."
-           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DOCSET}/latex)
+           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DOCSET}/latex
+           DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${DoxyTools_CONFIG_FILE} 
${OUTPUT_FILE_TEX})
     ENDIF(genpdf AND PDFLATEX_COMPILER)
+       ADD_CUSTOM_TARGET(${DOCSET}_doc ALL DEPENDS ${OUTPUT_FILE_HTML} 
${OUTPUT_FILE_TEX} ${OUTPUT_FILE_PDF} )
+    ENDIF(OUTPUT_FILES)
 
-    IF (genhtml)
+    ADD_CUSTOM_TARGET(${DOCSET}_doc_forced
+           COMMAND ${CMAKE_COMMAND} -E echo_append "Building ${DOCSET} 
Documentation..."
+           COMMAND ${DOXYGEN_EXECUTABLE} 
${CMAKE_CURRENT_BINARY_DIR}/${DoxyTools_CONFIG_FILE}
+           COMMAND ${CMAKE_COMMAND} -E echo "Done."
+           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+    add_dependencies(${DOCSET}_doc_forced ${DOCSET}_doc)
+
+    IF (genhtml OR genpdf)
        MESSAGE(STATUS "Will build DOC Set <${DOCSET}> in 
<${DoxyTools_OUTPUT_DIR}>")
        CONFIGURE_FILE(doc_install.in ${DOCSET}_doc_install.cmake @ONLY)
        INSTALL(SCRIPT ${CMAKE_BINARY_DIR}/doc/${DOCSET}_doc_install.cmake 
COMPONENT DOC)
-    ENDIF (genhtml)
-
+    ENDIF ()
 ENDMACRO(DoxyTools_ADD_DocSet)
\ No newline at end of file