Merge topic 'doc-deprecation-variables'

c64326b Document some variables for deprecation control.

1 files changed, 24 insertions, 0 deletions

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 58df66c..fcaa169 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -514,6 +514,13 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "analysis of libraries linked by a target.",
      false,
      "Variables that Provide Information");
+  cm->DefineProperty
+    ("CMAKE_MINIMUM_REQUIRED_VERSION", cmProperty::VARIABLE,
+     "Version specified to cmake_minimum_required command",
+     "Variable containing the VERSION component specified in the "
+     "cmake_minimum_required command.",
+     false,
+     "Variables that Provide Information");
 
 
   // Variables defined by cmake, that change the behavior
@@ -678,6 +685,23 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "Variables That Change Behavior");
 
   cm->DefineProperty
+    ("CMAKE_WARN_DEPRECATED", cmProperty::VARIABLE,
+     "Whether to issue deprecation warnings for macros and functions.",
+     "If TRUE, this can be used by macros and functions to issue "
+     "deprecation warnings.  This variable is FALSE by default.",
+     false,
+     "Variables That Change Behavior");
+
+  cm->DefineProperty
+    ("CMAKE_ERROR_DEPRECATED", cmProperty::VARIABLE,
+     "Whether to issue deprecation errors for macros and functions.",
+     "If TRUE, this can be used by macros and functions to issue "
+     "fatal errors when deprecated macros or functions are used.  This "
+     "variable is FALSE by default.",
+     false,
+     "Variables That Change Behavior");
+
+  cm->DefineProperty
     ("CMAKE_PREFIX_PATH", cmProperty::VARIABLE,
      "Path used for searching by FIND_XXX(), with appropriate suffixes added.",
      "Specifies a path which will be used by the FIND_XXX() commands. It "