From: maier Date: Fri, 21 Sep 2012 18:50:41 +0000 (+0000) Subject: Reenable configure_doxygen and add a dependency for X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6515cf786bb897652022eedb3954d73533cb17f;p=dealii-svn.git Reenable configure_doxygen and add a dependency for DEAL_II_COMPONENT_DOCUMENTATION git-svn-id: https://svn.dealii.org/branches/branch_cmake@26609 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_doxygen.cmake b/deal.II/cmake/configure/configure_doxygen.cmake index d0801e19ab..6831e0713f 100644 --- a/deal.II/cmake/configure/configure_doxygen.cmake +++ b/deal.II/cmake/configure/configure_doxygen.cmake @@ -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() diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index 8b24ab45c2..be017fa485 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -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: #