]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Reenable configure_doxygen and add a dependency for
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 18:50:41 +0000 (18:50 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 18:50:41 +0000 (18:50 +0000)
DEAL_II_COMPONENT_DOCUMENTATION

git-svn-id: https://svn.dealii.org/branches/branch_cmake@26609 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_doxygen.cmake
deal.II/cmake/setup_finalize.cmake

index d0801e19ab01840375ca9c295b6415b083298920..6831e0713f76c2e133697a2285467e7b7bb0e610 100644 (file)
@@ -9,8 +9,7 @@ MACRO(FEATURE_DOXYGEN_FIND_EXTERNAL var)
   # We use doxygen and dot:
   #
   IF(DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND)
-    # Disable doxygen for the moment
-    #    SET(${var} TRUE)
+    SET(${var} TRUE)
   ENDIF()
 ENDMACRO()
 
index 8b24ab45c24ccdd8e95c584f396342c03362dcd7..be017fa485ecd77c24c85fcc34d5ade8443d3cd8 100644 (file)
@@ -3,6 +3,21 @@
 #
 
 
+#
+# Dependency check:
+# DEAL_II_COMPONENT_DOCUMENTATION needs DEAL_II_WITH_DOXYGEN.
+# TODO: It is a bit sloppy to test this here. But this is the only
+# dependency of this kind atm.
+#
+IF(DEAL_II_COMPONENT_DOCUMENTATION AND NOT DEAL_II_WITH_DOXYGEN)
+  MESSAGE(SEND_ERROR "\n"
+    "DEAL_II_COMPONENT_DOCUMENTATION has unmet configuration requirements: "
+    "DEAL_II_WITH_DOXYGEN has to be set to \"ON\".\n\n"
+    )
+ENDIF()
+
+
+
 #
 # Append the saved initial (cached) variables ${flags}_SAVED at the end of
 # ${flags}, see setup_cached_compiler_flags.cmake and the main
@@ -13,6 +28,7 @@ FOREACH(flags ${deal_ii_used_flags})
 ENDFOREACH()
 
 
+
 #
 # And print out a nice configuration summary:
 #

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.