From 9c9eb7ff5307f215de941ddd26f9e3040bf4b473 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 1 Nov 2012 21:13:58 +0000 Subject: [PATCH] Update the preliminary README.CMAKE git-svn-id: https://svn.dealii.org/branches/branch_cmake@27300 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/README.CMAKE | 7 ++----- deal.II/cmake/macros/macro_configure_feature.cmake | 7 +------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/deal.II/README.CMAKE b/deal.II/README.CMAKE index fef235b0a5..f06781ef3a 100644 --- a/deal.II/README.CMAKE +++ b/deal.II/README.CMAKE @@ -751,9 +751,6 @@ DEVELOPMENT A file cmake/configure/configure_.cmake defining how to configure : - DEAL_II_WITH_ (bool, mandatory) - An option for enabling or disabling the configuration of . - FEATURE__DEPENDS (variable, optional) a variable which contains an optional list of other features this feature depends on (and which have to be enbled for this feature @@ -770,7 +767,7 @@ DEVELOPMENT FEATURE__CONFIGURE_EXTERNAL(var) (macro, mandatory) which should setup all necessary configuration for the feature with external dependencies. var set to TRUE indicates success, - otherwise this script gives an error. + otherwise this script should issue a FATAL_ERROR. FEATURE__CONFIGURE_BUNDLED(var) (macro, optional) which should setup all necessary configuration for the feature with @@ -781,7 +778,7 @@ DEVELOPMENT is set up, or be undefined. FEATURE__ERROR_MESSAGE() (macro, optional) - which should print a meaningful error message (with SEND_ERROR) for + which should print a meaningful error message (with FATAL_ERROR) for the case that no external library was found (and bundled is not allowed to be used.) If not defined, a suitable default error message will be printed. diff --git a/deal.II/cmake/macros/macro_configure_feature.cmake b/deal.II/cmake/macros/macro_configure_feature.cmake index 918006b4dc..ecebcaf716 100644 --- a/deal.II/cmake/macros/macro_configure_feature.cmake +++ b/deal.II/cmake/macros/macro_configure_feature.cmake @@ -22,11 +22,6 @@ # For a feature ${feature} (written in all caps) the following options, # variables and macros have to be defined (except marked as optional): # -# DEAL_II_WITH_${feature} (bool, mandatory) -# If DEAL_II_FEATURE_AUTODETECTION is OFF, this boolean determines -# whether the feature will be configured. -# If DEAL_II_FEATURE_AUTODETECTION is ON, this boolean will -# automatically be set if configuring the feature was successful. # # FEATURE_${feature}_DEPENDS (variable, optional) # a variable which contains an optional list of other features @@ -42,7 +37,7 @@ # FEATURE_${feature}_CONFIGURE_BUNDLED(var) (macro, optional) # which should setup all necessary configuration for the feature with # bundled source dependencies. var set to TRUE indicates success, -# otherwise this script gives an error. +# otherwise this script should issue a FATAL_ERROR. # # FEATURE_${feature}_FIND_EXTERNAL(var) (macro, mandatory) # which should set var to TRUE if all dependencies for the feature are -- 2.39.5