From 7ec06eed1c577bbb0b97454ae0c572b2153e77f8 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 5 Mar 2016 03:05:45 -0600 Subject: [PATCH] Update documentation --- cmake/config/CMakeLists.txt | 6 +----- doc/developers/cmake-internals.html | 5 ++--- doc/users/cmakelists.html | 29 ++++++++--------------------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index 578d1f8e6c..26e582ee8a 100644 --- a/cmake/config/CMakeLists.txt +++ b/cmake/config/CMakeLists.txt @@ -171,11 +171,7 @@ SET(_files ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake ) -SET(_makefiles - ${CMAKE_BINARY_DIR}/${DEAL_II_SHARE_RELDIR}/Make.global_options - ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options - ) -FOREACH(_file ${_files} ${_makefiles}) +FOREACH(_file ${_files}) FILE(APPEND ${_file} "\n\n#\n# Feature configuration:\n#\n\n") ENDFOREACH() diff --git a/doc/developers/cmake-internals.html b/doc/developers/cmake-internals.html index 4c29722b2a..8004f8fc6f 100644 --- a/doc/developers/cmake-internals.html +++ b/doc/developers/cmake-internals.html @@ -695,9 +695,8 @@ EXPAND_INSTANTIATIONS(obj_dofs "${inst_in_files}")

The final bits of configuration happens in - ./cmake/config/CMakeLists.txt where the templates for - the project configuration deal.IIConfig.cmake and the - compatibility file Make.global_options get expanded. + ./cmake/config/CMakeLists.txt where the templates for the + project configuration deal.IIConfig.cmake gets expanded. Furthermore, the configuration for the template expansion mechanism resides under ./cmake/config/template_arguments.in.

diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html index 77e14a3cdc..ecc73de2a8 100644 --- a/doc/users/cmakelists.html +++ b/doc/users/cmakelists.html @@ -47,7 +47,6 @@
  • Autopilot style CMakeLists.txt
  • deal.IIConfig.cmake
    • -
  • Make.global_options
    • @@ -863,25 +862,13 @@ DEAL_II_WITH_UMFPACK DEAL_II_WITH_ZLIB - -

    Make.global_options

    - -

    - The above CMake configuration file deal.IIConfig.cmake is also - available as a Makefile includable file called - Make.global_options. It resides under - share/deal.II/Make.global_options in the build and install - directory (or alternatively whichever relative path - DEAL_II_SHARE_RELDIR is set to). -

    - -
    -
    - - Valid HTML 4.01! - - Valid CSS! -
    +
    +
    + + Valid HTML 4.01! + + Valid CSS! +
    - + -- 2.39.5