mi024

commit 03d6fa940defadf627d717af03ec7a3b11adba10
parent 869225a0ffbd4f06f7d3d3455512bf9bffe05190
Author: Étienne Simon <etienne.jl.simon@gmail.com>
Date:   Tue, 19 Mar 2013 14:56:09 +0100

Correction de la construction de la documentation.

Diffstat:
M
cmake/UseLATEX.cmake
 | 
12
++++--------
M
doc/CMakeLists.txt
 | 
2
+-

2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/cmake/UseLATEX.cmake b/cmake/UseLATEX.cmake
@@ -55,10 +55,6 @@
 #                       target, it does not delete other input files, such as
 #                       converted images, to save time on the rebuild.
 #
-#       The dvi target is added to the ALL.  That is, it will be the target
-#       built by default.  If the DEFAULT_PDF argument is given, then the
-#       pdf target will be the default instead of dvi.
-#
 #       If the argument MANGLE_TARGET_NAMES is given, then each of the
 #       target names above will be mangled with the <tex_file> name.  This
 #       is to make the targets unique if ADD_LATEX_DOCUMENT is called for
@@ -71,7 +67,7 @@
 #
 # History:
 #
-# local Add VERBATIM to ADD_CUSTOM_* commands.
+# local Add VERBATIM and removed ALL to ADD_CUSTOM_* commands.
 #
 # 1.9.5 Add support for image types not directly supported by either latex
 #       or pdflatex.  (Thanks to Jorge Gerardo Pena Pastor for SVG support.)
@@ -1200,7 +1196,7 @@ FUNCTION(ADD_LATEX_TARGETS_INTERNAL)
     ADD_CUSTOM_TARGET(${dvi_target}
       DEPENDS ${output_dir}/${LATEX_TARGET}.dvi VERBATIM)
   ELSE (LATEX_DEFAULT_PDF OR LATEX_DEFAULT_SAFEPDF)
-    ADD_CUSTOM_TARGET(${dvi_target} ALL
+    ADD_CUSTOM_TARGET(${dvi_target}
       DEPENDS ${output_dir}/${LATEX_TARGET}.dvi VERBATIM)
   ENDIF (LATEX_DEFAULT_PDF OR LATEX_DEFAULT_SAFEPDF)
 
@@ -1212,7 +1208,7 @@ FUNCTION(ADD_LATEX_TARGETS_INTERNAL)
       VERBATIM
       )
     IF (LATEX_DEFAULT_PDF)
-      ADD_CUSTOM_TARGET(${pdf_target} ALL
+      ADD_CUSTOM_TARGET(${pdf_target}
         DEPENDS ${output_dir}/${LATEX_TARGET}.pdf VERBATIM)
     ELSE (LATEX_DEFAULT_PDF)
       ADD_CUSTOM_TARGET(${pdf_target}
@@ -1232,7 +1228,7 @@ FUNCTION(ADD_LATEX_TARGETS_INTERNAL)
       # cannot properly do the dependencies for both.  When selecting safepdf,
       # simply force a recompile every time.
       IF (LATEX_DEFAULT_SAFEPDF)
-        ADD_CUSTOM_TARGET(${safepdf_target} ALL
+        ADD_CUSTOM_TARGET(${safepdf_target}
           ${CMAKE_COMMAND} -E chdir ${output_dir}
           ${PS2PDF_CONVERTER} ${PS2PDF_CONVERTER_FLAGS} ${LATEX_TARGET}.ps ${LATEX_TARGET}.pdf
           VERBATIM
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -5,7 +5,7 @@ set(LATEX_DOCUMENTS
 	"operational plan.tex"
 )
 
-add_custom_target(doc ALL)
+add_custom_target(doc)
 
 foreach(LATEX_DOCUMENT ${LATEX_DOCUMENTS})
 	add_latex_document(${LATEX_DOCUMENT} IMAGE_DIRS images DEFAULT_PDF MANGLE_TARGET_NAMES)