From 94b7079990b235ae5048461c3278781b7220a972 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 21 Sep 2012 14:17:55 +0000 Subject: [PATCH] Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26596 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/CMakeLists.txt | 15 +-------------- deal.II/doc/doxygen/CMakeLists.txt | 7 ++++--- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/deal.II/doc/CMakeLists.txt b/deal.II/doc/CMakeLists.txt index 3c7f9bfaff..65681fdabf 100644 --- a/deal.II/doc/CMakeLists.txt +++ b/deal.II/doc/CMakeLists.txt @@ -15,23 +15,10 @@ IF(DEAL_II_WITH_DOXYGEN) # Install the homepage: # - IF(DEAL_II_INSTALL_COMPAT_FILES) - # - # The good, old directory where the documentation gets installed to: - # - SET(DEAL_II_DOCUMENTATION_RELDIR "doc") - ELSE() - # - # IF DEAL_II_INSTALL_COMPAT_FILES is not set, we assume that we have to - # obey the file system standard, so install to usr/share/doc/deal.II. - # - SET(DEAL_II_DOCUMENTATION_RELDIR "usr/share/doc/deal.II/html") - ENDIF() - INSTALL(DIRECTORY . DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR} COMPONENT documentation - FILES_MATCHING REGEX "^.*(html|css|eps|fig|png)$" # TODO! cmapx, dot + FILES_MATCHING REGEX "^.*(html|css|eps|fig|png)$" # TODO ) CONFIGURE_FILE( diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt index 1c423725a2..6512ff68da 100644 --- a/deal.II/doc/doxygen/CMakeLists.txt +++ b/deal.II/doc/doxygen/CMakeLists.txt @@ -71,9 +71,10 @@ ADD_CUSTOM_TARGET(doxygen ALL # TODO: Really all? DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/deal.II ${CMAKE_CURRENT_BINARY_DIR}/options.dox - ${CMAKE_CURRENT_BINARY_DIR}/header.html - ${CMAKE_CURRENT_BINARY_DIR}/footer.html - ${CMAKE_CURRENT_BINARY_DIR}/filter + #already generated at configuration time: + #${CMAKE_CURRENT_BINARY_DIR}/header.html + #${CMAKE_CURRENT_BINARY_DIR}/footer.html + #${CMAKE_CURRENT_BINARY_DIR}/filter #${CMAKE_BINARY_DIR}/include/deal.II/base/config.h #${CMAKE_BINARY_DIR}/include/deal.II/lac/lapack_templates.h COMMENT "Generating documentation via doxygen" -- 2.39.5