From 87b48b60b46a594a833b7c0202145cfb228a66fa Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 12 Mar 2013 11:24:00 +0000 Subject: [PATCH] CMake: Fix a cache invalidation issue with the DEAL_II_COMPONENT_DOCUMENTATION toggle git-svn-id: https://svn.dealii.org/trunk@28864 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 4 +++- deal.II/doc/CMakeLists.txt | 23 ++++++++++++++++++++++- deal.II/doc/doxygen/CMakeLists.txt | 16 ---------------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 5cb5f29368..f2edc9f9c7 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -115,6 +115,9 @@ INCLUDE(setup_finalize) # # ########################################################################### +MESSAGE(STATUS "") +MESSAGE(STATUS "Configuring done. Include CMakeLists.txt now.") + IF(DEAL_II_HAVE_BUNDLED_DIRECTORY) ADD_SUBDIRECTORY(bundled) ENDIF() @@ -145,4 +148,3 @@ INCLUDE(setup_custom_targets) # FILE(READ ${CMAKE_BINARY_DIR}/summary.log DEAL_II_LOG_SUMMARY) MESSAGE("${DEAL_II_LOG_SUMMARY}") - diff --git a/deal.II/doc/CMakeLists.txt b/deal.II/doc/CMakeLists.txt index d3565b18d4..fd7d788e0e 100644 --- a/deal.II/doc/CMakeLists.txt +++ b/deal.II/doc/CMakeLists.txt @@ -12,12 +12,33 @@ ## ##### + # -# Set up all necessary bits for the documentation +# Required packages for the document generation: # +FIND_PACKAGE(Perl) +FIND_PACKAGE(Doxygen) + +# +# Set up all necessary bits for the documentation +# IF(DEAL_II_COMPONENT_DOCUMENTATION) + # + # Do we have all necessary dependencies? + # + IF(NOT PERL_FOUND) + MESSAGE(FATAL_ERROR + "Could not find a perl installation which is required for building the documentation" + ) + ENDIF() + IF(NOT DOXYGEN_FOUND OR NOT DOXYGEN_DOT_FOUND) + MESSAGE(FATAL_ERROR + "Could not find doxygen and dot which is required for building the documentation" + ) + ENDIF() + # # Generate the source documentation via doxygen: # diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt index 58c74d4c89..3fbaecae6b 100644 --- a/deal.II/doc/doxygen/CMakeLists.txt +++ b/deal.II/doc/doxygen/CMakeLists.txt @@ -12,29 +12,15 @@ ## ##### -FIND_PACKAGE(Perl REQUIRED) -FIND_PACKAGE(Doxygen REQUIRED) - -IF(NOT DOXYGEN_FOUND OR NOT DOXYGEN_DOT_FOUND) - # Just to be sure that we actually have dot... - MESSAGE(FATAL_ERROR - "Could not find doxygen and dot which is required for building the documentation" - ) -ENDIF() - - # # Prepare the example steps for doxygen: # - ADD_SUBDIRECTORY(tutorial) ADD_SUBDIRECTORY(images) - # # Prepare auxiliary files for doxygen: # - CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/options.dox.in ${CMAKE_CURRENT_BINARY_DIR}/options.dox @@ -60,7 +46,6 @@ CONFIGURE_FILE( # # Finalize the doxygen configuration: # - file(GLOB doxygen_input ${CMAKE_CURRENT_SOURCE_DIR}/headers/*.h ${CMAKE_SOURCE_DIR}/contrib/parameter_gui/*.h @@ -92,7 +77,6 @@ FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/options.dox" # # And, finally, call doxygen: # - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doxygen.log -- 2.39.5