]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 23:30:49 +0000 (23:30 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 23:30:49 +0000 (23:30 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27019 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/CMakeLists.txt
deal.II/doc/Makefile.in [deleted file]
deal.II/doc/doxygen/CMakeLists.txt

index c61389509c23e2a7e14b3572b557104a47a68d6f..e3f4e7454cef9b265968f529dad056cccee55777 100644 (file)
@@ -25,7 +25,7 @@ IF(DEAL_II_COMPONENT_DOCUMENTATION)
 
 
   #
-  # Install the homepage:
+  # Install the remaining (static) elements of documentation:
   #
 
   INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
diff --git a/deal.II/doc/Makefile.in b/deal.II/doc/Makefile.in
deleted file mode 100644 (file)
index 28b8f29..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-
-###############################
-# Configured variables
-
-D     = @prefix@
-include $D/common/Make.global_options
-
-
-# default target. make sure validate-xrefs is only run after
-# everything else (can't appear in the list of dependencies since
-# would be run at the same time for parallel makes)
-default: doxygen development
-       @$(MAKE) validate-xrefs
-
-all: default
-
-
-# specific targets
-doxygen:
-       cd doxygen ; rm -f *.tag ; $(MAKE)
-
-development:
-       cd development ; $(MAKE)
-
-glossary:
-       cd glossary ; $(MAKE)
-
-
-validate-xrefs:
-       @echo "Validating cross-references in HTML files."
-       $(PERL) $D/common/scripts/validate-xrefs.pl *html
-       cd doxygen ; $(MAKE) validate-xrefs
-       cd development ; $(MAKE) validate-xrefs
-       cd publications ; $(MAKE) validate-xrefs
-       cd news ; $(MAKE) validate-xrefs
-       cd reports ; $(MAKE) validate-xrefs
-
-
-clean:
-       cd doxygen ; $(MAKE) clean
-       cd development ; $(MAKE) clean
-       cd glossary ; $(MAKE) clean
-
-
-.PHONY: default doxygen all autogen-doc autogen-doc-all clean development validate-xrefs glossary
index b1331c53205fca26e23f1c3ebfa7754797b69a90..45bbbeb0f3320114889b17b05eab550e938b0e6f 100644 (file)
@@ -22,11 +22,18 @@ IF(NOT DOXYGEN_FOUND OR NOT DOXYGEN_DOT_FOUND)
     )
 ENDIF()
 
+
 #
 # Prepare the example steps for inclusion:
 #
+
 ADD_SUBDIRECTORY(tutorial)
 
+
+#
+# Prepare auxiliary files for doxygen:
+#
+
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/options.dox.in
   ${CMAKE_CURRENT_BINARY_DIR}/options.dox
@@ -49,6 +56,24 @@ CONFIGURE_FILE(
   COPYONLY
   )
 
+ADD_CUSTOM_COMMAND(
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/images/structure.png
+    ${CMAKE_CURRENT_BINARY_DIR}/images/structure.cmapx
+  COMMAND ${DOXYGEN_DOT_EXECUTABLE}
+  ARGS
+    -Tpng -o ${CMAKE_CURRENT_BINARY_DIR}/images/structure.png
+    -Tcmapx -o ${CMAKE_CURRENT_BINARY_DIR}/images/strucutre.cmapx
+    ${CMAKE_CURRENT_SOURCE_DIR}/images/structure.dot
+  DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/images/structure.dot
+  )
+
+
+#
+# Finalize the doxygen configuration:
+#
+
 file(GLOB doxygen_input
   ${CMAKE_SOURCE_DIR}/include/deal.II/*
   ${CMAKE_BINARY_DIR}/include/deal.II/*
@@ -61,7 +86,6 @@ file(GLOB doxygen_input
 
 TO_STRING(doxygen_input ${doxygen_input})
 
-
 file(GLOB doxygen_image_path
   ${CMAKE_CURRENT_SOURCE_DIR}/images
   ${CMAKE_SOURCE_DIR}/examples/*/doc
@@ -69,7 +93,6 @@ file(GLOB doxygen_image_path
   )
 TO_STRING(doxygen_image_path ${doxygen_image_path})
 
-
 FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/options.dox"
   "
   INPUT=${doxygen_input}
@@ -83,7 +106,10 @@ ADD_CUSTOM_TARGET(doxygen ALL # TODO: Really all?
   #
   ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/options.dox
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  COMMENT "Generating documentation via doxygen"
+  DEPENDS
+    ${CMAKE_CURRENT_BINARY_DIR}/images/structure.png
+    ${CMAKE_CURRENT_BINARY_DIR}/images/structure.cmapx
+  COMMENT "Generating documentation via doxygen (This may take a _really_ long time)"
   VERBATIM
   )
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.