]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Update the preliminary README.CMAKE
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 1 Nov 2012 21:13:58 +0000 (21:13 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 1 Nov 2012 21:13:58 +0000 (21:13 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27300 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/README.CMAKE
deal.II/cmake/macros/macro_configure_feature.cmake

index fef235b0a50b19a2a5806bdb620e7f4778d794c6..f06781ef3a4497adb22553e5434c70d76b08188e 100644 (file)
@@ -751,9 +751,6 @@ DEVELOPMENT
   A file cmake/configure/configure_<feature>.cmake defining how to
   configure <feature>:
 
-    DEAL_II_WITH_<FEATURE> (bool, mandatory)
-       An option for enabling or disabling the configuration of <feature>.
-
     FEATURE_<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_<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_<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_<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.
index 918006b4dce7211a28269aeb7d52c9c00883023b..ecebcaf71677239b1622a7abf65858cc1ed33e3e 100644 (file)
 # 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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.