From 92e0ca9046ea2e6b55a689a3df4a9bb02eaff417 Mon Sep 17 00:00:00 2001
From: Matthew Woehlke <matthew.woehlke@kitware.com>
Date: Tue, 12 May 2026 14:42:33 -0400
Subject: [PATCH] Diagnostics: Show author message for all descendants

Tweak `cmMessenger` to also show the "warning is for project developers"
notice for all diagnostics that are descendants of the `CMD_AUTHOR`
category. When doing so, also show both command-line options which can
suppress the message.
---
 Source/cmMessenger.cxx                        | 38 +++++++++++++++----
 .../Autogen_2/QtAutoMocDeps-stderr.txt        |  4 +-
 .../CMP0080-COMMAND-OLD-stderr.txt            |  4 +-
 .../BundleUtilities/CMP0080-OLD-stderr.txt    |  4 +-
 .../CMP0026/CMP0026-IMPORTED-stderr.txt       |  4 +-
 Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0081/CMP0081-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0102/CMP0102-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0104/CMP0104-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0106/CMP0106-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0111/CMP0111-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0115/CMP0115-OLD-stderr.txt |  2 +
 .../RunCMake/CMP0116/CMP0116-Mixed-stderr.txt |  2 +
 .../CMP0116/CMP0116-OLD-NOWARN-stderr.txt     |  4 +-
 .../CMP0116/CMP0116-OLD-WARN-stderr.txt       |  4 +-
 .../CMP0118/CMP0118-OLD-Test1-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test10-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test11-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test12-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test13-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test14-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test15-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test16-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test1b-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test2-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test2b-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test2c-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test2d-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test3-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test3b-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test4-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test4b-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test5-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test6-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test7-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test8-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test8b-stderr.txt     |  2 +
 .../CMP0118/CMP0118-OLD-Test9-stderr.txt      |  2 +
 .../CMP0118/CMP0118-OLD-Test9b-stderr.txt     |  2 +
 .../CMP0118/GenInSubdir-OLD-stderr.txt        |  2 +
 Tests/RunCMake/CMP0119/CMP0119-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0126/CMP0126-OLD-stderr.txt |  4 +-
 .../CMP0126/CMP0126-OLD_CL-stderr.txt         |  4 +-
 Tests/RunCMake/CMP0129/C-OLD-stderr.txt       |  4 +-
 Tests/RunCMake/CMP0129/CXX-OLD-stderr.txt     |  4 +-
 Tests/RunCMake/CMP0129/Fortran-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0132/CMP0132-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0135/CMP0135-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0139/CMP0139-OLD-stderr.txt |  2 +
 Tests/RunCMake/CMP0150/CMP0150-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0152/CMP0152-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0153/CMP0153-OLD-stderr.txt |  4 +-
 Tests/RunCMake/CMP0218/CMP0218-OLD-stderr.txt |  7 +++-
 .../Regex-CMP0127-OLD-stderr.txt              |  4 +-
 .../CMakePresets/ErrorDeprecated-stderr.txt   |  4 +-
 .../RunCMake/CMakePresets/ErrorDev-stderr.txt |  6 ++-
 .../CMakePresets/NoWarningFlags-stderr.txt    |  7 ++--
 .../CMakePresets/WarningFlags-stderr.txt      |  7 ++--
 .../CTest/CMP0145-Dart-OLD-stderr.txt         |  6 ++-
 .../CTest/CMP0145-Dart-WARN-stderr.txt        |  4 +-
 .../CTest/CMP0145-FindDart-OLD-stderr.txt     |  4 +-
 .../CXXModules/CMP0155-OLD-stderr.txt         |  4 +-
 .../CheckIPOSupported/CMP0138-OLD-stderr.txt  |  4 +-
 .../cmp0069-is-old-stderr.txt                 |  2 +
 .../RunCMake/CheckModules/CMP0075-stderr.txt  |  4 +-
 .../CMP0128WarnMatch-stderr.txt               |  2 +
 .../CMP0128WarnUnset-stderr.txt               |  2 +
 .../Add_StepDependencies-stderr.txt           |  4 +-
 .../Add_StepDependencies_no_target-stderr.txt |  4 +-
 .../NO_DEPENDS-CMP0114-OLD-stderr.txt         |  2 +
 .../Steps-CMP0114-OLD-stderr.txt              |  4 +-
 .../File_Generate/CMP0070-OLD-stderr.txt      |  6 ++-
 .../File_Generate/CMP0070-WARN-stderr.txt     |  2 +
 .../SourceProperty-CMP0070-OLD-stderr.txt     |  4 ++
 .../File_Generate/SourceProperty-stderr.txt   |  4 +-
 .../RunCMake/FindBoost/CMP0093-OLD-stderr.txt |  4 +-
 .../FindOpenGL/CMP0072-OLD-stderr.txt         |  4 +-
 .../CMP0085-OLD-stderr.txt                    |  4 +-
 .../CMP0141-OLD-stderr.txt                    |  4 +-
 .../MSVCDefaultFlags/CMP0092-OLD-stderr.txt   |  4 +-
 .../MSVCRuntimeLibrary/CMP0091-OLD-stderr.txt |  4 +-
 .../CMP0117-OLD-stderr.txt                    |  4 +-
 Tests/RunCMake/Make/CMP0113-OLD-stderr.txt    |  4 +-
 .../NinjaPrivateDeps/CMP0154-OLD-stderr.txt   |  4 +-
 .../PchReuseFrom-CMP0141-OLD-stderr.txt       |  4 +-
 Tests/RunCMake/RunCMake.cmake                 |  2 +
 .../ToolchainFile/CMP0126-OLD-stderr.txt      |  2 +
 Tests/RunCMake/UseSWIG/CMP0078-OLD-stderr.txt |  4 +-
 Tests/RunCMake/UseSWIG/CMP0086-OLD-stderr.txt |  4 +-
 Tests/RunCMake/UseSWIG/CMP0122-OLD-stderr.txt |  4 +-
 .../CustomCommandParallelDisable-stderr.txt   |  4 +-
 .../VS10Project/VsCSharpCustomTags-stderr.txt |  4 +-
 .../VsCSharpReferenceProps-stderr.txt         |  9 +++--
 .../CMP0091-OLD-stderr.txt                    |  4 +-
 .../VSSolution/CMP0143-OLD-stderr.txt         |  4 +-
 .../CMP0120-OLD-Direct-stderr.txt             |  4 +-
 .../CMP0120-OLD-stderr.txt                    |  4 +-
 .../XcodeProject/SearchPaths-stderr.txt       |  4 +-
 Tests/RunCMake/add_library/CMP0073-stderr.txt |  4 +-
 .../add_subdirectory/CMP0082-OLD-stderr.txt   |  4 +-
 .../CMP0110-OLD-AlphaNumeric-stderr.txt       |  4 +-
 .../CMP0110-OLD-BracketArgument-stderr.txt    |  4 +-
 ...CMP0110-OLD-EscapedSpecialChars-stderr.txt |  4 +-
 ...0-OLD-FormerInvalidSpecialChars-stderr.txt |  4 +-
 ...OLD-FormerInvalidSpecialCharsMC-stderr.txt |  4 +-
 ...LD-LeadingAndTrailingWhitespace-stderr.txt |  4 +-
 .../CMP0110-OLD-OtherSpecialChars-stderr.txt  |  4 +-
 .../add_test/CMP0110-OLD-Quote-stderr.txt     |  4 +-
 .../add_test/CMP0110-OLD-Semicolon-stderr.txt |  4 +-
 .../add_test/CMP0110-OLD-Space-stderr.txt     |  4 +-
 .../CMP0110-OLD-ValidSpecialChars-stderr.txt  |  4 +-
 .../duplicate-target-CMP0107-OLD-stderr.txt   |  4 +-
 .../RunCMake/block/Scope-POLICIES-stderr.txt  |  4 +-
 .../RunCMake/block/Scope-VARIABLES-stderr.txt |  4 +-
 Tests/RunCMake/block/Scope-stderr.txt         |  4 +-
 .../BeforeVersionDeprecated-stderr.txt        |  6 ++-
 .../export/Repeat-CMP0103-OLD-stderr.txt      |  4 +-
 Tests/RunCMake/file/REAL_PATH-stderr.txt      |  4 +-
 Tests/RunCMake/find_file/NO_CACHE-stderr.txt  |  2 +
 .../find_file/Registry-query-stderr.txt       |  4 +-
 .../RunCMake/find_library/NO_CACHE-stderr.txt |  2 +
 .../find_library/Registry-query-stderr.txt    |  4 +-
 .../find_package/CMP0084-OLD-stderr.txt       |  4 +-
 .../CMP0144-OLD-CaseInsensitive-stderr.txt    |  2 +
 .../CMP0144-OLD-CaseSensitive-stderr.txt      |  2 +
 .../find_package/CMP0145-OLD-stderr.txt       |  4 +-
 .../find_package/CMP0146-OLD-stderr.txt       |  4 +-
 .../find_package/CMP0147-NEW-stderr.txt       |  2 +
 .../find_package/CMP0147-OLD-stderr.txt       |  6 ++-
 .../find_package/CMP0147-WARN-stderr.txt      |  4 +-
 .../CMP0148-Interp-OLD-stderr.txt             |  4 +-
 .../find_package/CMP0148-Libs-OLD-stderr.txt  |  4 +-
 .../find_package/Registry-query-stderr.txt    |  4 +-
 Tests/RunCMake/find_path/NO_CACHE-stderr.txt  |  2 +
 .../find_path/Registry-query-stderr.txt       |  4 +-
 .../find_program/CMP0109-OLD-stderr.txt       |  4 +-
 .../RunCMake/find_program/NO_CACHE-stderr.txt |  2 +
 .../find_program/Registry-query-stderr.txt    |  4 +-
 .../foreach-var-scope-CMP0124-OLD-stderr.txt  |  4 +-
 Tests/RunCMake/include/CMP0146-OLD-stderr.txt |  4 +-
 .../include/CMP0148-Interp-OLD-stderr.txt     |  4 +-
 .../include/CMP0148-Libs-OLD-stderr.txt       |  4 +-
 Tests/RunCMake/install/CMP0087-OLD-stderr.txt |  4 +-
 ...ETS-FILE_RPATH_CHANGE-new_rpath-stderr.txt |  4 +-
 .../message/defaultmessage-stderr.txt         |  5 ++-
 .../errormessage_deprecated-stderr.txt        |  4 +-
 .../message-log-level-debug-stderr.txt        |  2 +
 .../message-log-level-default-stderr.txt      |  2 +
 .../message-log-level-notice-stderr.txt       |  2 +
 .../message-log-level-override-stderr.txt     |  2 +
 .../message-log-level-status-stderr.txt       |  2 +
 .../message-log-level-trace-stderr.txt        |  2 +
 .../message-log-level-verbose-stderr.txt      |  2 +
 .../message-log-level-warning-stderr.txt      |  2 +
 .../message/message-loglevel-debug-stderr.txt |  2 +
 .../message-loglevel-default-stderr.txt       |  2 +
 .../message-loglevel-notice-stderr.txt        |  2 +
 .../message-loglevel-status-stderr.txt        |  2 +
 .../message/message-loglevel-trace-stderr.txt |  2 +
 .../message-loglevel-verbose-stderr.txt       |  2 +
 .../message-loglevel-warning-stderr.txt       |  2 +
 Tests/RunCMake/message/warnmessage-stderr.txt |  5 ++-
 Tests/RunCMake/option/CMP0077-OLD-stderr.txt  |  4 +-
 Tests/RunCMake/project/CMP0096-OLD-stderr.txt |  4 +-
 Tests/RunCMake/project/VersionMax-stderr.txt  |  4 +-
 Tests/RunCMake/return/CMP0140-OLD-stderr.txt  |  4 +-
 .../CMP0101-BEFORE_keyword-stderr.txt         |  4 +-
 .../CMP0079-iface-OLD-stderr.txt              |  4 +-
 .../CMP0079-link-OLD-stderr.txt               |  2 +
 .../CMP0108-OLD-self-link-stderr.txt          |  4 +-
 Tests/RunCMake/try_compile/CMP0066-stderr.txt |  6 ++-
 Tests/RunCMake/try_compile/CMP0067-stderr.txt |  4 +-
 Tests/RunCMake/while/CMP0130-OLD-stderr.txt   |  4 +-
 174 files changed, 510 insertions(+), 132 deletions(-)

diff --git a/Source/cmMessenger.cxx b/Source/cmMessenger.cxx
index ebe24166c1..12176baba8 100644
--- a/Source/cmMessenger.cxx
+++ b/Source/cmMessenger.cxx
@@ -64,6 +64,17 @@ cm::StdIo::TermAttr getMessageColor(MessageType t)
   }
 }
 
+bool isAuthorDiagnostic(cmDiagnosticCategory category)
+{
+  while (category != cmDiagnostics::CMD_NONE) {
+    if (category == cmDiagnostics::CMD_AUTHOR) {
+      return true;
+    }
+    category = cmDiagnostics::CategoryInfo[category].Parent;
+  }
+  return false;
+}
+
 void printMessageText(std::ostream& msg, std::string const& text)
 {
   msg << ":\n";
@@ -75,19 +86,30 @@ void printMessageText(std::ostream& msg, std::string const& text)
 void displayMessage(MessageType type, cmDiagnosticCategory category,
                     std::ostringstream& msg)
 {
-  if (category == cmDiagnostics::CMD_AUTHOR) {
+  if (isAuthorDiagnostic(category)) {
     // Add a note about warning suppression.
+    std::ostringstream text;
     if (type == MessageType::WARNING) {
-      msg << "This warning is for project developers.  "
-             "Use -Wno-author to suppress it.";
+      text << "This warning is for project developers.  "
+              "Use -Wno-author";
+      if (category != cmDiagnostics::CMD_AUTHOR) {
+        text << " or -Wno-" << getDiagnosticCategoryStr(category);
+      }
     } else if (type == MessageType::FATAL_ERROR) {
-      msg << "This error is for project developers.  "
-             "Use -Wno-error=author to suppress it.";
+      text << "This error is for project developers.  "
+              "Use -Wno-error=author";
+      if (category != cmDiagnostics::CMD_AUTHOR) {
+        text << " or -Wno-error=" << getDiagnosticCategoryStr(category);
+      }
     }
-  }
+    text << " to suppress it.";
 
-  // Add a terminating blank line.
-  msg << '\n';
+    cmDocumentationFormatter formatter;
+    formatter.PrintFormatted(msg, text.str());
+  } else {
+    // Add a terminating blank line.
+    msg << '\n';
+  }
 
 #if !defined(CMAKE_BOOTSTRAP)
   // Add a C++ stack trace to internal errors.
diff --git a/Tests/RunCMake/Autogen_2/QtAutoMocDeps-stderr.txt b/Tests/RunCMake/Autogen_2/QtAutoMocDeps-stderr.txt
index 9313ae9419..20029fb7f1 100644
--- a/Tests/RunCMake/Autogen_2/QtAutoMocDeps-stderr.txt
+++ b/Tests/RunCMake/Autogen_2/QtAutoMocDeps-stderr.txt
@@ -5,4 +5,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/BundleUtilities/CMP0080-COMMAND-OLD-stderr.txt b/Tests/RunCMake/BundleUtilities/CMP0080-COMMAND-OLD-stderr.txt
index 6091d9d3a7..8bd62019fd 100644
--- a/Tests/RunCMake/BundleUtilities/CMP0080-COMMAND-OLD-stderr.txt
+++ b/Tests/RunCMake/BundleUtilities/CMP0080-COMMAND-OLD-stderr.txt
@@ -6,4 +6,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/BundleUtilities/CMP0080-OLD-stderr.txt b/Tests/RunCMake/BundleUtilities/CMP0080-OLD-stderr.txt
index 9a2b08be78..11df59d527 100644
--- a/Tests/RunCMake/BundleUtilities/CMP0080-OLD-stderr.txt
+++ b/Tests/RunCMake/BundleUtilities/CMP0080-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
index d294a2f2b1..58530683e5 100644
--- a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
+++ b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt b/Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt
index 41856a0054..3e13559c64 100644
--- a/Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt b/Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt
index 57fc637db9..74d992819a 100644
--- a/Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0081/CMP0081-OLD-stderr.txt b/Tests/RunCMake/CMP0081/CMP0081-OLD-stderr.txt
index 0de3a5b08b..073bd1e435 100644
--- a/Tests/RunCMake/CMP0081/CMP0081-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0081/CMP0081-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0102/CMP0102-OLD-stderr.txt b/Tests/RunCMake/CMP0102/CMP0102-OLD-stderr.txt
index dfb45244af..8434e258de 100644
--- a/Tests/RunCMake/CMP0102/CMP0102-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0102/CMP0102-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0104/CMP0104-OLD-stderr.txt b/Tests/RunCMake/CMP0104/CMP0104-OLD-stderr.txt
index d9ba7c49f6..eff2817826 100644
--- a/Tests/RunCMake/CMP0104/CMP0104-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0104/CMP0104-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0106/CMP0106-OLD-stderr.txt b/Tests/RunCMake/CMP0106/CMP0106-OLD-stderr.txt
index 7f5eacd5bd..3e0bcd8d91 100644
--- a/Tests/RunCMake/CMP0106/CMP0106-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0106/CMP0106-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0111/CMP0111-OLD-stderr.txt b/Tests/RunCMake/CMP0111/CMP0111-OLD-stderr.txt
index 3140f181d1..91c955a4cb 100644
--- a/Tests/RunCMake/CMP0111/CMP0111-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0111/CMP0111-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0115/CMP0115-OLD-stderr.txt b/Tests/RunCMake/CMP0115/CMP0115-OLD-stderr.txt
index 654a83de6b..6db078ced8 100644
--- a/Tests/RunCMake/CMP0115/CMP0115-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0115/CMP0115-OLD-stderr.txt
@@ -6,6 +6,8 @@
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at CMP0115\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
diff --git a/Tests/RunCMake/CMP0116/CMP0116-Mixed-stderr.txt b/Tests/RunCMake/CMP0116/CMP0116-Mixed-stderr.txt
index 793cc0dab7..44f8245c6d 100644
--- a/Tests/RunCMake/CMP0116/CMP0116-Mixed-stderr.txt
+++ b/Tests/RunCMake/CMP0116/CMP0116-Mixed-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at CMP0116-Mixed\.cmake:1 \(add_custom_command\):
   Policy CMP0116 is not set: Ninja generators transform DEPFILEs from
diff --git a/Tests/RunCMake/CMP0116/CMP0116-OLD-NOWARN-stderr.txt b/Tests/RunCMake/CMP0116/CMP0116-OLD-NOWARN-stderr.txt
index 098eb22d21..762396d623 100644
--- a/Tests/RunCMake/CMP0116/CMP0116-OLD-NOWARN-stderr.txt
+++ b/Tests/RunCMake/CMP0116/CMP0116-OLD-NOWARN-stderr.txt
@@ -5,4 +5,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0116/CMP0116-OLD-WARN-stderr.txt b/Tests/RunCMake/CMP0116/CMP0116-OLD-WARN-stderr.txt
index 098eb22d21..762396d623 100644
--- a/Tests/RunCMake/CMP0116/CMP0116-OLD-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0116/CMP0116-OLD-WARN-stderr.txt
@@ -5,4 +5,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
index bbbe4542d8..b844f57ea3 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 prop: `0`
 CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(target_sources\):
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
index 466127d825..534ea3b892 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source0\.txt: # 1a # GENERATED = `1`
 Generated_source0\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
index b7d28455b9..4debc24b72 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source0\.txt: # 1a # GENERATED = `1`
 Generated_source0\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
index a3ad779a34..da383bb4d1 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at subdir-Common-Test12/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
   TARGET 'custom[4-6]' was not created in this directory\.
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
index 4d0a846693..c58a594b8d 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
   TARGET 'custom[4-6]' was not created in this directory\.
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
index 423dc3d92b..41b741c928 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source0\.txt: # 1a # GENERATED = `1`
 Generated_source0\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
index 2154138ca5..03794ce4c2 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source0\.txt: # 1a # GENERATED = `1`
 Generated_source0\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test16-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test16-stderr.txt
index 15ff8b9fed..fcaa962ff3 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test16-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test16-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at subdir-Common-Test16/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
   TARGET 'custom4' was not created in this directory\.
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1b-stderr.txt
index d40fd6b7f4..6fb80b5629 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1b-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 prop: `NOTFOUND`
 CMake Error at CMP0118-Common-Test1b\.cmake:[0-9]+ \(target_sources\):
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2-stderr.txt
index 7ac9392c2e..ffde85dc45 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2-stderr.txt
@@ -8,5 +8,7 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 prop: `1`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2b-stderr.txt
index 12821d7fc5..640736e712 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2b-stderr.txt
@@ -8,5 +8,7 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 prop: `1`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2c-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2c-stderr.txt
index 1824389e48..3d40524e3b 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2c-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2c-stderr.txt
@@ -8,5 +8,7 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 prop: `1`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2d-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2d-stderr.txt
index d21a6b315c..0921ab7ee9 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2d-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test2d-stderr.txt
@@ -8,5 +8,7 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 prop: `1`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
index f3552d5e21..fee5dd9d01 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
 Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
index 2c56153477..6f8eb48800 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
 Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
index 26713c1333..22e2484a66 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
 Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
index e13819251e..8864e9c175 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
 Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
index ec32e8584e..18b5a79054 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
 Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
index 07b80bf799..5dd94f33ab 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source1\.txt: # 1a # GENERATED = `1`
 Generated_source1\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
index 84122b55f8..025950a75e 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source1\.txt: # 1a # GENERATED = `1`
 Generated_source1\.txt: # 1b # GENERATED = `1`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
index 4b66cef274..4170d35e39 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source1\.txt: # 1a # GENERATED = `0`
 Generated_source1\.txt: # 1b # GENERATED = `0`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8b-stderr.txt
index ea380b9d7b..61f88dd63b 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8b-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source1\.txt: # 1a # GENERATED = `0`
 Generated_source1\.txt: # 1b # GENERATED = `0`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
index 9b6841cb3c..1df9823da0 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source1\.txt: # 1a # GENERATED = `0`
 Generated_source1\.txt: # 1b # GENERATED = `0`
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9b-stderr.txt
index f857e3fe68..be684afe7a 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9b-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 Generated_source1\.txt: # 1a # GENERATED = `0`
 Generated_source1\.txt: # 1b # GENERATED = `0`
diff --git a/Tests/RunCMake/CMP0118/GenInSubdir-OLD-stderr.txt b/Tests/RunCMake/CMP0118/GenInSubdir-OLD-stderr.txt
index 915b80352a..f506eca6a2 100644
--- a/Tests/RunCMake/CMP0118/GenInSubdir-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0118/GenInSubdir-OLD-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at GenInSubdir/CMakeLists\.txt:[0-9]+ \(target_sources\):
   Cannot find source file:
diff --git a/Tests/RunCMake/CMP0119/CMP0119-OLD-stderr.txt b/Tests/RunCMake/CMP0119/CMP0119-OLD-stderr.txt
index cb7f9185f0..936dad281f 100644
--- a/Tests/RunCMake/CMP0119/CMP0119-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0119/CMP0119-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0126/CMP0126-OLD-stderr.txt b/Tests/RunCMake/CMP0126/CMP0126-OLD-stderr.txt
index 62e89e12bb..0875fc62b6 100644
--- a/Tests/RunCMake/CMP0126/CMP0126-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0126/CMP0126-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0126/CMP0126-OLD_CL-stderr.txt b/Tests/RunCMake/CMP0126/CMP0126-OLD_CL-stderr.txt
index a3307f6425..6caae0247c 100644
--- a/Tests/RunCMake/CMP0126/CMP0126-OLD_CL-stderr.txt
+++ b/Tests/RunCMake/CMP0126/CMP0126-OLD_CL-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0129/C-OLD-stderr.txt b/Tests/RunCMake/CMP0129/C-OLD-stderr.txt
index f0f805ae4e..4c1eca2359 100644
--- a/Tests/RunCMake/CMP0129/C-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0129/C-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0129/CXX-OLD-stderr.txt b/Tests/RunCMake/CMP0129/CXX-OLD-stderr.txt
index 0451cc0f9a..65e4c5cf8a 100644
--- a/Tests/RunCMake/CMP0129/CXX-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0129/CXX-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0129/Fortran-OLD-stderr.txt b/Tests/RunCMake/CMP0129/Fortran-OLD-stderr.txt
index 486d7334b5..e1bc43a5f3 100644
--- a/Tests/RunCMake/CMP0129/Fortran-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0129/Fortran-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0132/CMP0132-OLD-stderr.txt b/Tests/RunCMake/CMP0132/CMP0132-OLD-stderr.txt
index 390523f244..c2b64dfdba 100644
--- a/Tests/RunCMake/CMP0132/CMP0132-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0132/CMP0132-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0135/CMP0135-OLD-stderr.txt b/Tests/RunCMake/CMP0135/CMP0135-OLD-stderr.txt
index 3b4ad488d4..8a3203f68a 100644
--- a/Tests/RunCMake/CMP0135/CMP0135-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0135/CMP0135-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0139/CMP0139-OLD-stderr.txt b/Tests/RunCMake/CMP0139/CMP0139-OLD-stderr.txt
index 1fdc5edcfb..c4c0cc7b6e 100644
--- a/Tests/RunCMake/CMP0139/CMP0139-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0139/CMP0139-OLD-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at CMP0139-OLD\.cmake:[0-9]+ \(if\):
   if given arguments:
diff --git a/Tests/RunCMake/CMP0150/CMP0150-OLD-stderr.txt b/Tests/RunCMake/CMP0150/CMP0150-OLD-stderr.txt
index cf3a7fd2d1..57b439a432 100644
--- a/Tests/RunCMake/CMP0150/CMP0150-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0150/CMP0150-OLD-stderr.txt
@@ -6,4 +6,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0152/CMP0152-OLD-stderr.txt b/Tests/RunCMake/CMP0152/CMP0152-OLD-stderr.txt
index caf20786c1..71f5dade47 100644
--- a/Tests/RunCMake/CMP0152/CMP0152-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0152/CMP0152-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0153/CMP0153-OLD-stderr.txt b/Tests/RunCMake/CMP0153/CMP0153-OLD-stderr.txt
index 05fee0e141..f589d29883 100644
--- a/Tests/RunCMake/CMP0153/CMP0153-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0153/CMP0153-OLD-stderr.txt
@@ -6,4 +6,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMP0218/CMP0218-OLD-stderr.txt b/Tests/RunCMake/CMP0218/CMP0218-OLD-stderr.txt
index 2e27a1c09b..fed4f0fe89 100644
--- a/Tests/RunCMake/CMP0218/CMP0218-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0218/CMP0218-OLD-stderr.txt
@@ -7,8 +7,11 @@ CMake Warning \(deprecated\) at [^
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
-
-
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
++
 CMake Error \(deprecated\) at [^
 ]+/Tests/RunCMake/CMP0218/CMP0218-OLD\.cmake:[0-9]+ \(message\):
   Test
+This error is for project developers\.  Use -Wno-error=author or
+-Wno-error=deprecated to suppress it\.
diff --git a/Tests/RunCMake/CMakeDependentOption/Regex-CMP0127-OLD-stderr.txt b/Tests/RunCMake/CMakeDependentOption/Regex-CMP0127-OLD-stderr.txt
index 31b963d660..1a680663cd 100644
--- a/Tests/RunCMake/CMakeDependentOption/Regex-CMP0127-OLD-stderr.txt
+++ b/Tests/RunCMake/CMakeDependentOption/Regex-CMP0127-OLD-stderr.txt
@@ -6,4 +6,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CMakePresets/ErrorDeprecated-stderr.txt b/Tests/RunCMake/CMakePresets/ErrorDeprecated-stderr.txt
index f182d46124..2b8c98ca63 100644
--- a/Tests/RunCMake/CMakePresets/ErrorDeprecated-stderr.txt
+++ b/Tests/RunCMake/CMakePresets/ErrorDeprecated-stderr.txt
@@ -4,4 +4,6 @@
 Call Stack \(most recent call first\):
   [^
 ]*/Tests/RunCMake/CMakePresets/ErrorDeprecated\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This error is for project developers\.  Use -Wno-error=author or
+-Wno-error=deprecated to suppress it\.$
diff --git a/Tests/RunCMake/CMakePresets/ErrorDev-stderr.txt b/Tests/RunCMake/CMakePresets/ErrorDev-stderr.txt
index 569c364e8f..c55b91e174 100644
--- a/Tests/RunCMake/CMakePresets/ErrorDev-stderr.txt
+++ b/Tests/RunCMake/CMakePresets/ErrorDev-stderr.txt
@@ -6,11 +6,13 @@ Call Stack \(most recent call first\):
 ]*/Tests/RunCMake/CMakePresets/ErrorDev\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 This error is for project developers\.  Use -Wno-error=author to suppress it\.
-
++
 CMake Error \(deprecated\) at [^
 ]*/Tests/RunCMake/CMakePresets/WarningsBase\.cmake:[0-9]+ \(message\):
   Deprecation warning
 Call Stack \(most recent call first\):
   [^
 ]*/Tests/RunCMake/CMakePresets/ErrorDev\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This error is for project developers\.  Use -Wno-error=author or
+-Wno-error=deprecated to suppress it\.$
diff --git a/Tests/RunCMake/CMakePresets/NoWarningFlags-stderr.txt b/Tests/RunCMake/CMakePresets/NoWarningFlags-stderr.txt
index 6e717ed926..d18e9ecfda 100644
--- a/Tests/RunCMake/CMakePresets/NoWarningFlags-stderr.txt
+++ b/Tests/RunCMake/CMakePresets/NoWarningFlags-stderr.txt
@@ -6,7 +6,7 @@ Call Stack \(most recent call first\):
 ]*/Tests/RunCMake/CMakePresets/NoWarningFlags\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-author to suppress it\.
-
++
 CMake Warning \(deprecated\) at [^
 ]*/Tests/RunCMake/CMakePresets/WarningsBase\.cmake:[0-9]+ \(message\):
   Deprecation warning
@@ -14,8 +14,9 @@ Call Stack \(most recent call first\):
   [^
 ]*/Tests/RunCMake/CMakePresets/NoWarningFlags\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
-
-
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
++
 CMake Warning \(unused-cli\):
   Manually-specified variables were not used by the project:
 
diff --git a/Tests/RunCMake/CMakePresets/WarningFlags-stderr.txt b/Tests/RunCMake/CMakePresets/WarningFlags-stderr.txt
index 15da2cdf4e..3ab49defbc 100644
--- a/Tests/RunCMake/CMakePresets/WarningFlags-stderr.txt
+++ b/Tests/RunCMake/CMakePresets/WarningFlags-stderr.txt
@@ -14,7 +14,7 @@ Call Stack \(most recent call first\):
 ]*/Tests/RunCMake/CMakePresets/WarningFlags\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-author to suppress it\.
-
++
 CMake Warning \(deprecated\) at [^
 ]*/Tests/RunCMake/CMakePresets/WarningsBase\.cmake:[0-9]+ \(message\):
   Deprecation warning
@@ -22,8 +22,9 @@ Call Stack \(most recent call first\):
   [^
 ]*/Tests/RunCMake/CMakePresets/WarningFlags\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
-
-
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
++
 CMake Warning \(uninitialized\) at [^
 ]*/Tests/RunCMake/CMakePresets/WarningsBase\.cmake:[0-9]+ \(set\):
   uninitialized variable 'UNINITIALIZED_VARIABLE'
diff --git a/Tests/RunCMake/CTest/CMP0145-Dart-OLD-stderr.txt b/Tests/RunCMake/CTest/CMP0145-Dart-OLD-stderr.txt
index 8af4bdccb8..6fa95e5d6d 100644
--- a/Tests/RunCMake/CTest/CMP0145-Dart-OLD-stderr.txt
+++ b/Tests/RunCMake/CTest/CMP0145-Dart-OLD-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:5 \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(deprecated\) at [^
 ]*/Modules/Dart\.cmake:[0-9]+ \(cmake_policy\):
@@ -20,4 +22,6 @@ CMake Warning \(deprecated\) at [^
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMP0145-Dart-OLD\.cmake:3 \(include\)
-  CMakeLists\.txt:5 \(include\)$
+  CMakeLists\.txt:5 \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CTest/CMP0145-Dart-WARN-stderr.txt b/Tests/RunCMake/CTest/CMP0145-Dart-WARN-stderr.txt
index 976448a103..fd7f6d1d98 100644
--- a/Tests/RunCMake/CTest/CMP0145-Dart-WARN-stderr.txt
+++ b/Tests/RunCMake/CTest/CMP0145-Dart-WARN-stderr.txt
@@ -28,4 +28,6 @@ CMake Warning \(deprecated\) at [^
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMP0145-Dart-WARN\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CTest/CMP0145-FindDart-OLD-stderr.txt b/Tests/RunCMake/CTest/CMP0145-FindDart-OLD-stderr.txt
index d0fccdda0d..ad82835514 100644
--- a/Tests/RunCMake/CTest/CMP0145-FindDart-OLD-stderr.txt
+++ b/Tests/RunCMake/CTest/CMP0145-FindDart-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CXXModules/CMP0155-OLD-stderr.txt b/Tests/RunCMake/CXXModules/CMP0155-OLD-stderr.txt
index 126654307d..988218fe7e 100644
--- a/Tests/RunCMake/CXXModules/CMP0155-OLD-stderr.txt
+++ b/Tests/RunCMake/CXXModules/CMP0155-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CheckIPOSupported/CMP0138-OLD-stderr.txt b/Tests/RunCMake/CheckIPOSupported/CMP0138-OLD-stderr.txt
index 14e2824bee..e14eee3483 100644
--- a/Tests/RunCMake/CheckIPOSupported/CMP0138-OLD-stderr.txt
+++ b/Tests/RunCMake/CheckIPOSupported/CMP0138-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt b/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt
index 832c32d329..67e244bde2 100644
--- a/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt
+++ b/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at .*/Modules/CheckIPOSupported\.cmake:[0-9]+ \(message\):
   Policy CMP0069 set to OLD
diff --git a/Tests/RunCMake/CheckModules/CMP0075-stderr.txt b/Tests/RunCMake/CheckModules/CMP0075-stderr.txt
index b8b2ce07ee..a0ed60d90d 100644
--- a/Tests/RunCMake/CheckModules/CMP0075-stderr.txt
+++ b/Tests/RunCMake/CheckModules/CMP0075-stderr.txt
@@ -58,4 +58,6 @@ CMake Warning \(deprecated\) at CMP0075\.cmake:[0-9]+ \(cmake_policy\):
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/CompileFeatures/CMP0128WarnMatch-stderr.txt b/Tests/RunCMake/CompileFeatures/CMP0128WarnMatch-stderr.txt
index b5fc8ed901..7bd95c1c4f 100644
--- a/Tests/RunCMake/CompileFeatures/CMP0128WarnMatch-stderr.txt
+++ b/Tests/RunCMake/CompileFeatures/CMP0128WarnMatch-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) in CMakeLists\.txt:
   Policy CMP0128 is not set: Selection of language standard and extension
diff --git a/Tests/RunCMake/CompileFeatures/CMP0128WarnUnset-stderr.txt b/Tests/RunCMake/CompileFeatures/CMP0128WarnUnset-stderr.txt
index ff4c65d7af..158b1743fb 100644
--- a/Tests/RunCMake/CompileFeatures/CMP0128WarnUnset-stderr.txt
+++ b/Tests/RunCMake/CompileFeatures/CMP0128WarnUnset-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) in CMakeLists\.txt:
   Policy CMP0128 is not set: Selection of language standard and extension
diff --git a/Tests/RunCMake/ExternalProject/Add_StepDependencies-stderr.txt b/Tests/RunCMake/ExternalProject/Add_StepDependencies-stderr.txt
index 9f7fa95f3b..5a6eebbf18 100644
--- a/Tests/RunCMake/ExternalProject/Add_StepDependencies-stderr.txt
+++ b/Tests/RunCMake/ExternalProject/Add_StepDependencies-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\))?$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.)?$
diff --git a/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target-stderr.txt b/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target-stderr.txt
index cd1e96bfed..b4f7f18cb0 100644
--- a/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target-stderr.txt
+++ b/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\))?$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.)?$
diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS-CMP0114-OLD-stderr.txt b/Tests/RunCMake/ExternalProject/NO_DEPENDS-CMP0114-OLD-stderr.txt
index d3b69ff0c3..9dca2da727 100644
--- a/Tests/RunCMake/ExternalProject/NO_DEPENDS-CMP0114-OLD-stderr.txt
+++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS-CMP0114-OLD-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at [^
 ]*/Modules/ExternalProject\.cmake:[0-9]+ \(message\):
diff --git a/Tests/RunCMake/ExternalProject/Steps-CMP0114-OLD-stderr.txt b/Tests/RunCMake/ExternalProject/Steps-CMP0114-OLD-stderr.txt
index 979ac17878..4c111f2344 100644
--- a/Tests/RunCMake/ExternalProject/Steps-CMP0114-OLD-stderr.txt
+++ b/Tests/RunCMake/ExternalProject/Steps-CMP0114-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt b/Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt
index 46a3786a7a..e6aa1cd4ea 100644
--- a/Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt
+++ b/Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt
@@ -5,6 +5,8 @@
   Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
   to tell CMake that the project requires at least <min> but has been updated
   to work with policies introduced by <max> or earlier\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(deprecated\) at CMP0070-OLD\.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0070 will be removed from a future version
@@ -15,4 +17,6 @@ CMake Warning \(deprecated\) at CMP0070-OLD\.cmake:[0-9]+ \(cmake_policy\):
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/File_Generate/CMP0070-WARN-stderr.txt b/Tests/RunCMake/File_Generate/CMP0070-WARN-stderr.txt
index 76b84f3ff1..555a84bb35 100644
--- a/Tests/RunCMake/File_Generate/CMP0070-WARN-stderr.txt
+++ b/Tests/RunCMake/File_Generate/CMP0070-WARN-stderr.txt
@@ -5,6 +5,8 @@
   Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
   to tell CMake that the project requires at least <min> but has been updated
   to work with policies introduced by <max> or earlier\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 (CMake Warning \(author\) in CMakeLists\.txt:
   Policy CMP0070 is not set: Define file\(GENERATE\) behavior for relative
diff --git a/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD-stderr.txt b/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD-stderr.txt
index 4a9344d7a4..d487f16f4d 100644
--- a/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD-stderr.txt
+++ b/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD-stderr.txt
@@ -5,6 +5,8 @@
   Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
   to tell CMake that the project requires at least <min> but has been updated
   to work with policies introduced by <max> or earlier\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(deprecated\) at SourceProperty-CMP0070-OLD\.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0070 will be removed from a future version
@@ -16,6 +18,8 @@ CMake Warning \(deprecated\) at SourceProperty-CMP0070-OLD\.cmake:[0-9]+ \(cmake
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at SourceProperty-CMP0070-OLD\.cmake:[0-9]+ \(target_sources\):
   Cannot find source file:
diff --git a/Tests/RunCMake/File_Generate/SourceProperty-stderr.txt b/Tests/RunCMake/File_Generate/SourceProperty-stderr.txt
index 3788d83bf5..e25b783aba 100644
--- a/Tests/RunCMake/File_Generate/SourceProperty-stderr.txt
+++ b/Tests/RunCMake/File_Generate/SourceProperty-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/FindBoost/CMP0093-OLD-stderr.txt b/Tests/RunCMake/FindBoost/CMP0093-OLD-stderr.txt
index 7210d55ff7..6b62ee0d10 100644
--- a/Tests/RunCMake/FindBoost/CMP0093-OLD-stderr.txt
+++ b/Tests/RunCMake/FindBoost/CMP0093-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/FindOpenGL/CMP0072-OLD-stderr.txt b/Tests/RunCMake/FindOpenGL/CMP0072-OLD-stderr.txt
index 91568994f3..d1a478b639 100644
--- a/Tests/RunCMake/FindOpenGL/CMP0072-OLD-stderr.txt
+++ b/Tests/RunCMake/FindOpenGL/CMP0072-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:3 \(include\)$
+  CMakeLists\.txt:3 \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/GeneratorExpression/CMP0085-OLD-stderr.txt b/Tests/RunCMake/GeneratorExpression/CMP0085-OLD-stderr.txt
index 7e621e462b..2b623c1ad5 100644
--- a/Tests/RunCMake/GeneratorExpression/CMP0085-OLD-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/CMP0085-OLD-stderr.txt
@@ -5,4 +5,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt
index 831436cc23..f50645b9c3 100644
--- a/Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt
+++ b/Tests/RunCMake/MSVCDebugInformationFormat/CMP0141-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/MSVCDefaultFlags/CMP0092-OLD-stderr.txt b/Tests/RunCMake/MSVCDefaultFlags/CMP0092-OLD-stderr.txt
index ab419ab22b..3d51000130 100644
--- a/Tests/RunCMake/MSVCDefaultFlags/CMP0092-OLD-stderr.txt
+++ b/Tests/RunCMake/MSVCDefaultFlags/CMP0092-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/MSVCRuntimeLibrary/CMP0091-OLD-stderr.txt b/Tests/RunCMake/MSVCRuntimeLibrary/CMP0091-OLD-stderr.txt
index f478ef69b8..0a32608592 100644
--- a/Tests/RunCMake/MSVCRuntimeLibrary/CMP0091-OLD-stderr.txt
+++ b/Tests/RunCMake/MSVCRuntimeLibrary/CMP0091-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/MSVCRuntimeTypeInfo/CMP0117-OLD-stderr.txt b/Tests/RunCMake/MSVCRuntimeTypeInfo/CMP0117-OLD-stderr.txt
index 993873780d..b6b1ab4766 100644
--- a/Tests/RunCMake/MSVCRuntimeTypeInfo/CMP0117-OLD-stderr.txt
+++ b/Tests/RunCMake/MSVCRuntimeTypeInfo/CMP0117-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/Make/CMP0113-OLD-stderr.txt b/Tests/RunCMake/Make/CMP0113-OLD-stderr.txt
index c642bd7473..65bbb754df 100644
--- a/Tests/RunCMake/Make/CMP0113-OLD-stderr.txt
+++ b/Tests/RunCMake/Make/CMP0113-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/NinjaPrivateDeps/CMP0154-OLD-stderr.txt b/Tests/RunCMake/NinjaPrivateDeps/CMP0154-OLD-stderr.txt
index 2b53efd5e5..6f0c7560e2 100644
--- a/Tests/RunCMake/NinjaPrivateDeps/CMP0154-OLD-stderr.txt
+++ b/Tests/RunCMake/NinjaPrivateDeps/CMP0154-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/PrecompileHeaders-Reuse/PchReuseFrom-CMP0141-OLD-stderr.txt b/Tests/RunCMake/PrecompileHeaders-Reuse/PchReuseFrom-CMP0141-OLD-stderr.txt
index eb2d2130ba..1d15d51fcb 100644
--- a/Tests/RunCMake/PrecompileHeaders-Reuse/PchReuseFrom-CMP0141-OLD-stderr.txt
+++ b/Tests/RunCMake/PrecompileHeaders-Reuse/PchReuseFrom-CMP0141-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index e9dac6f329..b849634efb 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -242,6 +242,8 @@ function(run_cmake test)
   Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
   to tell CMake that the project requires at least <min> but has been updated
   to work with policies introduced by <max> or earlier\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 ]] "" actual_stderr "${actual_stderr}")
   endif()
diff --git a/Tests/RunCMake/ToolchainFile/CMP0126-OLD-stderr.txt b/Tests/RunCMake/ToolchainFile/CMP0126-OLD-stderr.txt
index 7046c1e6f8..91e6589e85 100644
--- a/Tests/RunCMake/ToolchainFile/CMP0126-OLD-stderr.txt
+++ b/Tests/RunCMake/ToolchainFile/CMP0126-OLD-stderr.txt
@@ -8,5 +8,7 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 try_compile CMP0126='OLD' VAR='2'
diff --git a/Tests/RunCMake/UseSWIG/CMP0078-OLD-stderr.txt b/Tests/RunCMake/UseSWIG/CMP0078-OLD-stderr.txt
index 82f4e89034..cf879f03bc 100644
--- a/Tests/RunCMake/UseSWIG/CMP0078-OLD-stderr.txt
+++ b/Tests/RunCMake/UseSWIG/CMP0078-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/UseSWIG/CMP0086-OLD-stderr.txt b/Tests/RunCMake/UseSWIG/CMP0086-OLD-stderr.txt
index 0f13e3e2b2..1cb7ea217e 100644
--- a/Tests/RunCMake/UseSWIG/CMP0086-OLD-stderr.txt
+++ b/Tests/RunCMake/UseSWIG/CMP0086-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/UseSWIG/CMP0122-OLD-stderr.txt b/Tests/RunCMake/UseSWIG/CMP0122-OLD-stderr.txt
index 6fe08543d3..8560a7c9f4 100644
--- a/Tests/RunCMake/UseSWIG/CMP0122-OLD-stderr.txt
+++ b/Tests/RunCMake/UseSWIG/CMP0122-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/VS10Project/CustomCommandParallelDisable-stderr.txt b/Tests/RunCMake/VS10Project/CustomCommandParallelDisable-stderr.txt
index ce305a52fb..90ad79a26c 100644
--- a/Tests/RunCMake/VS10Project/CustomCommandParallelDisable-stderr.txt
+++ b/Tests/RunCMake/VS10Project/CustomCommandParallelDisable-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt
index 1cc4e83af5..6f1a325e0c 100644
--- a/Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt
+++ b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt
@@ -1,3 +1,5 @@
 ^CMake Warning \(deprecated\) in CMakeLists\.txt:
   The C# target "foo" is of type STATIC_LIBRARY\.  This is discouraged \(and
-  may be disabled in future\)\.  Make it a SHARED library instead\.$
+  may be disabled in future\)\.  Make it a SHARED library instead\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt b/Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt
index 9c99ade69b..cb0f8e2685 100644
--- a/Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt
+++ b/Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt
@@ -1,8 +1,11 @@
 ^CMake Warning \(deprecated\) in CMakeLists\.txt:
   The C# target "foo2" is of type STATIC_LIBRARY\.  This is discouraged \(and
   may be disabled in future\)\.  Make it a SHARED library instead\.
-
-
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
++
 CMake Warning \(deprecated\) in CMakeLists\.txt:
   The C# target "foo" is of type STATIC_LIBRARY\.  This is discouraged \(and
-  may be disabled in future\)\.  Make it a SHARED library instead\.$
+  may be disabled in future\)\.  Make it a SHARED library instead\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/VS10ProjectUseDebugLibraries/CMP0091-OLD-stderr.txt b/Tests/RunCMake/VS10ProjectUseDebugLibraries/CMP0091-OLD-stderr.txt
index a7251db06e..b61084a611 100644
--- a/Tests/RunCMake/VS10ProjectUseDebugLibraries/CMP0091-OLD-stderr.txt
+++ b/Tests/RunCMake/VS10ProjectUseDebugLibraries/CMP0091-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/VSSolution/CMP0143-OLD-stderr.txt b/Tests/RunCMake/VSSolution/CMP0143-OLD-stderr.txt
index 54df3c6e59..4c4f487876 100644
--- a/Tests/RunCMake/VSSolution/CMP0143-OLD-stderr.txt
+++ b/Tests/RunCMake/VSSolution/CMP0143-OLD-stderr.txt
@@ -5,4 +5,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-Direct-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-Direct-stderr.txt
index 69c1c7aaa9..3b185a1ba7 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-Direct-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-Direct-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-stderr.txt
index 5169b386f7..85bfb85deb 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/CMP0120-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt b/Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt
index 937f50462d..4b93d200bf 100644
--- a/Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt
+++ b/Tests/RunCMake/XcodeProject/SearchPaths-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_library/CMP0073-stderr.txt b/Tests/RunCMake/add_library/CMP0073-stderr.txt
index 2c1ec4ff67..0d581acfa8 100644
--- a/Tests/RunCMake/add_library/CMP0073-stderr.txt
+++ b/Tests/RunCMake/add_library/CMP0073-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_subdirectory/CMP0082-OLD-stderr.txt b/Tests/RunCMake/add_subdirectory/CMP0082-OLD-stderr.txt
index 51c32bc687..8416ab5e96 100644
--- a/Tests/RunCMake/add_subdirectory/CMP0082-OLD-stderr.txt
+++ b/Tests/RunCMake/add_subdirectory/CMP0082-OLD-stderr.txt
@@ -5,4 +5,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-AlphaNumeric-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-AlphaNumeric-stderr.txt
index fbc2f0c4e5..b8b40fe35e 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-AlphaNumeric-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-AlphaNumeric-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-BracketArgument-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-BracketArgument-stderr.txt
index 81400ee37c..5d8166b505 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-BracketArgument-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-BracketArgument-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-EscapedSpecialChars-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-EscapedSpecialChars-stderr.txt
index 5025d1f41f..c7a98404bd 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-EscapedSpecialChars-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-EscapedSpecialChars-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialChars-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialChars-stderr.txt
index 4a8b13d475..a66a875a6c 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialChars-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialChars-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialCharsMC-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialCharsMC-stderr.txt
index ac75457e61..c5e23503e7 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialCharsMC-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-FormerInvalidSpecialCharsMC-stderr.txt
@@ -8,4 +8,6 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMP0110-OLD-FormerInvalidSpecialCharsMC\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-LeadingAndTrailingWhitespace-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-LeadingAndTrailingWhitespace-stderr.txt
index 08615f6674..b5f9133f7b 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-LeadingAndTrailingWhitespace-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-LeadingAndTrailingWhitespace-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-OtherSpecialChars-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-OtherSpecialChars-stderr.txt
index f61675c1c5..38cd45a577 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-OtherSpecialChars-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-OtherSpecialChars-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-Quote-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-Quote-stderr.txt
index 03b6bf80e0..ddf0538f7c 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-Quote-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-Quote-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-Semicolon-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-Semicolon-stderr.txt
index b28ccd4080..a80a4f9f98 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-Semicolon-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-Semicolon-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-Space-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-Space-stderr.txt
index ab1aebf643..0609098520 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-Space-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-Space-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/add_test/CMP0110-OLD-ValidSpecialChars-stderr.txt b/Tests/RunCMake/add_test/CMP0110-OLD-ValidSpecialChars-stderr.txt
index e9cec733f8..c3c40ce1f3 100644
--- a/Tests/RunCMake/add_test/CMP0110-OLD-ValidSpecialChars-stderr.txt
+++ b/Tests/RunCMake/add_test/CMP0110-OLD-ValidSpecialChars-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/alias_targets/duplicate-target-CMP0107-OLD-stderr.txt b/Tests/RunCMake/alias_targets/duplicate-target-CMP0107-OLD-stderr.txt
index 017b1892dd..1c16d1cbe5 100644
--- a/Tests/RunCMake/alias_targets/duplicate-target-CMP0107-OLD-stderr.txt
+++ b/Tests/RunCMake/alias_targets/duplicate-target-CMP0107-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/block/Scope-POLICIES-stderr.txt b/Tests/RunCMake/block/Scope-POLICIES-stderr.txt
index 3ee8c47a68..90617e122f 100644
--- a/Tests/RunCMake/block/Scope-POLICIES-stderr.txt
+++ b/Tests/RunCMake/block/Scope-POLICIES-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/block/Scope-VARIABLES-stderr.txt b/Tests/RunCMake/block/Scope-VARIABLES-stderr.txt
index 446e10c175..013b05af6e 100644
--- a/Tests/RunCMake/block/Scope-VARIABLES-stderr.txt
+++ b/Tests/RunCMake/block/Scope-VARIABLES-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/block/Scope-stderr.txt b/Tests/RunCMake/block/Scope-stderr.txt
index 7d0f58770a..1b2addff06 100644
--- a/Tests/RunCMake/block/Scope-stderr.txt
+++ b/Tests/RunCMake/block/Scope-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt b/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt
index cf3fe694c8..ff8f31f7e7 100644
--- a/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt
+++ b/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt
@@ -7,6 +7,8 @@
   to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:3 \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(deprecated\) at BeforeVersionDeprecated\.cmake:5 \(cmake_policy\):
   Compatibility with CMake < 3\.10 will be removed from a future version of
@@ -16,4 +18,6 @@ CMake Warning \(deprecated\) at BeforeVersionDeprecated\.cmake:5 \(cmake_policy\
   to tell CMake that the project requires at least <min> but has been updated
   to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:3 \(include\)$
+  CMakeLists\.txt:3 \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/export/Repeat-CMP0103-OLD-stderr.txt b/Tests/RunCMake/export/Repeat-CMP0103-OLD-stderr.txt
index 82a8da3fd2..45ddc2b346 100644
--- a/Tests/RunCMake/export/Repeat-CMP0103-OLD-stderr.txt
+++ b/Tests/RunCMake/export/Repeat-CMP0103-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/file/REAL_PATH-stderr.txt b/Tests/RunCMake/file/REAL_PATH-stderr.txt
index db306b4813..7ea4904268 100644
--- a/Tests/RunCMake/file/REAL_PATH-stderr.txt
+++ b/Tests/RunCMake/file/REAL_PATH-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\))?$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.)?$
diff --git a/Tests/RunCMake/find_file/NO_CACHE-stderr.txt b/Tests/RunCMake/find_file/NO_CACHE-stderr.txt
index 75ff10dfa1..4c41d94584 100644
--- a/Tests/RunCMake/find_file/NO_CACHE-stderr.txt
+++ b/Tests/RunCMake/find_file/NO_CACHE-stderr.txt
@@ -8,3 +8,5 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
diff --git a/Tests/RunCMake/find_file/Registry-query-stderr.txt b/Tests/RunCMake/find_file/Registry-query-stderr.txt
index d06a80bba7..b41aed6dfe 100644
--- a/Tests/RunCMake/find_file/Registry-query-stderr.txt
+++ b/Tests/RunCMake/find_file/Registry-query-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_library/NO_CACHE-stderr.txt b/Tests/RunCMake/find_library/NO_CACHE-stderr.txt
index 75ff10dfa1..4c41d94584 100644
--- a/Tests/RunCMake/find_library/NO_CACHE-stderr.txt
+++ b/Tests/RunCMake/find_library/NO_CACHE-stderr.txt
@@ -8,3 +8,5 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
diff --git a/Tests/RunCMake/find_library/Registry-query-stderr.txt b/Tests/RunCMake/find_library/Registry-query-stderr.txt
index d06a80bba7..b41aed6dfe 100644
--- a/Tests/RunCMake/find_library/Registry-query-stderr.txt
+++ b/Tests/RunCMake/find_library/Registry-query-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/CMP0084-OLD-stderr.txt b/Tests/RunCMake/find_package/CMP0084-OLD-stderr.txt
index 0f4395a92a..fd1fe802e9 100644
--- a/Tests/RunCMake/find_package/CMP0084-OLD-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0084-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/CMP0144-OLD-CaseInsensitive-stderr.txt b/Tests/RunCMake/find_package/CMP0144-OLD-CaseInsensitive-stderr.txt
index 3425266186..8d3a481a75 100644
--- a/Tests/RunCMake/find_package/CMP0144-OLD-CaseInsensitive-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0144-OLD-CaseInsensitive-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 ----------
 FOO_ROOT     : ''
diff --git a/Tests/RunCMake/find_package/CMP0144-OLD-CaseSensitive-stderr.txt b/Tests/RunCMake/find_package/CMP0144-OLD-CaseSensitive-stderr.txt
index 1db89847d0..2d29fb046e 100644
--- a/Tests/RunCMake/find_package/CMP0144-OLD-CaseSensitive-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0144-OLD-CaseSensitive-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 ----------
 FOO_ROOT     : ''
diff --git a/Tests/RunCMake/find_package/CMP0145-OLD-stderr.txt b/Tests/RunCMake/find_package/CMP0145-OLD-stderr.txt
index 7c9899e0e1..13b1f3c4b1 100644
--- a/Tests/RunCMake/find_package/CMP0145-OLD-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0145-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/CMP0146-OLD-stderr.txt b/Tests/RunCMake/find_package/CMP0146-OLD-stderr.txt
index d741c05579..18f257caab 100644
--- a/Tests/RunCMake/find_package/CMP0146-OLD-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0146-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/CMP0147-NEW-stderr.txt b/Tests/RunCMake/find_package/CMP0147-NEW-stderr.txt
index ef11a49fd8..cba40982d4 100644
--- a/Tests/RunCMake/find_package/CMP0147-NEW-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0147-NEW-stderr.txt
@@ -9,6 +9,8 @@
 Call Stack \(most recent call first\):
   CMP0147-NEW\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at [^
 ]*/Modules/FindCUDA\.cmake:[0-9]+ \(message\):
diff --git a/Tests/RunCMake/find_package/CMP0147-OLD-stderr.txt b/Tests/RunCMake/find_package/CMP0147-OLD-stderr.txt
index d57731a68c..941c77a3ba 100644
--- a/Tests/RunCMake/find_package/CMP0147-OLD-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0147-OLD-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:3 \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(deprecated\) at CMP0147-common\.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0146 will be removed from a future version
@@ -19,4 +21,6 @@ CMake Warning \(deprecated\) at CMP0147-common\.cmake:[0-9]+ \(cmake_policy\):
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMP0147-OLD\.cmake:2 \(include\)
-  CMakeLists\.txt:3 \(include\)$
+  CMakeLists\.txt:3 \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/CMP0147-WARN-stderr.txt b/Tests/RunCMake/find_package/CMP0147-WARN-stderr.txt
index 378f8dafe0..6f80508bdd 100644
--- a/Tests/RunCMake/find_package/CMP0147-WARN-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0147-WARN-stderr.txt
@@ -8,4 +8,6 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMP0147-WARN\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/CMP0148-Interp-OLD-stderr.txt b/Tests/RunCMake/find_package/CMP0148-Interp-OLD-stderr.txt
index 123b014523..173eb5c6f4 100644
--- a/Tests/RunCMake/find_package/CMP0148-Interp-OLD-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0148-Interp-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/CMP0148-Libs-OLD-stderr.txt b/Tests/RunCMake/find_package/CMP0148-Libs-OLD-stderr.txt
index 02deebb7a8..5f6e44d34c 100644
--- a/Tests/RunCMake/find_package/CMP0148-Libs-OLD-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0148-Libs-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_package/Registry-query-stderr.txt b/Tests/RunCMake/find_package/Registry-query-stderr.txt
index d06a80bba7..b41aed6dfe 100644
--- a/Tests/RunCMake/find_package/Registry-query-stderr.txt
+++ b/Tests/RunCMake/find_package/Registry-query-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_path/NO_CACHE-stderr.txt b/Tests/RunCMake/find_path/NO_CACHE-stderr.txt
index 75ff10dfa1..4c41d94584 100644
--- a/Tests/RunCMake/find_path/NO_CACHE-stderr.txt
+++ b/Tests/RunCMake/find_path/NO_CACHE-stderr.txt
@@ -8,3 +8,5 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
diff --git a/Tests/RunCMake/find_path/Registry-query-stderr.txt b/Tests/RunCMake/find_path/Registry-query-stderr.txt
index d06a80bba7..b41aed6dfe 100644
--- a/Tests/RunCMake/find_path/Registry-query-stderr.txt
+++ b/Tests/RunCMake/find_path/Registry-query-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_program/CMP0109-OLD-stderr.txt b/Tests/RunCMake/find_program/CMP0109-OLD-stderr.txt
index 1b39fb75cf..5ab5bde55c 100644
--- a/Tests/RunCMake/find_program/CMP0109-OLD-stderr.txt
+++ b/Tests/RunCMake/find_program/CMP0109-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/find_program/NO_CACHE-stderr.txt b/Tests/RunCMake/find_program/NO_CACHE-stderr.txt
index 75ff10dfa1..4c41d94584 100644
--- a/Tests/RunCMake/find_program/NO_CACHE-stderr.txt
+++ b/Tests/RunCMake/find_program/NO_CACHE-stderr.txt
@@ -8,3 +8,5 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
diff --git a/Tests/RunCMake/find_program/Registry-query-stderr.txt b/Tests/RunCMake/find_program/Registry-query-stderr.txt
index d06a80bba7..b41aed6dfe 100644
--- a/Tests/RunCMake/find_program/Registry-query-stderr.txt
+++ b/Tests/RunCMake/find_program/Registry-query-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/foreach/foreach-var-scope-CMP0124-OLD-stderr.txt b/Tests/RunCMake/foreach/foreach-var-scope-CMP0124-OLD-stderr.txt
index f4c480d932..adbd2dcd11 100644
--- a/Tests/RunCMake/foreach/foreach-var-scope-CMP0124-OLD-stderr.txt
+++ b/Tests/RunCMake/foreach/foreach-var-scope-CMP0124-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/include/CMP0146-OLD-stderr.txt b/Tests/RunCMake/include/CMP0146-OLD-stderr.txt
index d741c05579..18f257caab 100644
--- a/Tests/RunCMake/include/CMP0146-OLD-stderr.txt
+++ b/Tests/RunCMake/include/CMP0146-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/include/CMP0148-Interp-OLD-stderr.txt b/Tests/RunCMake/include/CMP0148-Interp-OLD-stderr.txt
index 123b014523..173eb5c6f4 100644
--- a/Tests/RunCMake/include/CMP0148-Interp-OLD-stderr.txt
+++ b/Tests/RunCMake/include/CMP0148-Interp-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/include/CMP0148-Libs-OLD-stderr.txt b/Tests/RunCMake/include/CMP0148-Libs-OLD-stderr.txt
index 02deebb7a8..5f6e44d34c 100644
--- a/Tests/RunCMake/include/CMP0148-Libs-OLD-stderr.txt
+++ b/Tests/RunCMake/include/CMP0148-Libs-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/install/CMP0087-OLD-stderr.txt b/Tests/RunCMake/install/CMP0087-OLD-stderr.txt
index 748cee0823..a83c7d4abb 100644
--- a/Tests/RunCMake/install/CMP0087-OLD-stderr.txt
+++ b/Tests/RunCMake/install/CMP0087-OLD-stderr.txt
@@ -5,4 +5,6 @@
   The cmake-policies\(7\) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances\.  Projects should be ported to the NEW
-  behavior and not rely on setting a policy to OLD\.$
+  behavior and not rely on setting a policy to OLD\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/install/TARGETS-FILE_RPATH_CHANGE-new_rpath-stderr.txt b/Tests/RunCMake/install/TARGETS-FILE_RPATH_CHANGE-new_rpath-stderr.txt
index dadadaacf3..35593931f6 100644
--- a/Tests/RunCMake/install/TARGETS-FILE_RPATH_CHANGE-new_rpath-stderr.txt
+++ b/Tests/RunCMake/install/TARGETS-FILE_RPATH_CHANGE-new_rpath-stderr.txt
@@ -8,7 +8,9 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   TARGETS-FILE_RPATH_CHANGE-new_rpath\.cmake:[0-9]+ \(A_CMP0095\)
-  CMakeLists\.txt:[0-9]+ \(include\)(
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.(
 +
 CMake Warning \(author\) at TARGETS-FILE_RPATH_CHANGE-new_rpath\.cmake:[0-9]+ \(install\):
   Policy CMP0095 is not set: RPATH entries are properly escaped in the
diff --git a/Tests/RunCMake/message/defaultmessage-stderr.txt b/Tests/RunCMake/message/defaultmessage-stderr.txt
index fe8edeeee8..9b3c7d6302 100644
--- a/Tests/RunCMake/message/defaultmessage-stderr.txt
+++ b/Tests/RunCMake/message/defaultmessage-stderr.txt
@@ -2,8 +2,9 @@
   This is a deprecation warning
 Call Stack \(most recent call first\):
   CMakeLists\.txt:3 \(include\)
-
-
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
++
 CMake Warning \(author\) at defaultmessage\.cmake:4 \(message\):
   This is a author warning
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/message/errormessage_deprecated-stderr.txt b/Tests/RunCMake/message/errormessage_deprecated-stderr.txt
index 1ca848b9fe..5275fbd28b 100644
--- a/Tests/RunCMake/message/errormessage_deprecated-stderr.txt
+++ b/Tests/RunCMake/message/errormessage_deprecated-stderr.txt
@@ -1,4 +1,6 @@
 ^CMake Error \(deprecated\) at errormessage_deprecated\.cmake:3 \(message\):
   This is a deprecation error
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:3 \(include\)$
+  CMakeLists\.txt:3 \(include\)
+This error is for project developers\.  Use -Wno-error=author or
+-Wno-error=deprecated to suppress it\.$
diff --git a/Tests/RunCMake/message/message-log-level-debug-stderr.txt b/Tests/RunCMake/message/message-log-level-debug-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-log-level-debug-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-debug-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-log-level-default-stderr.txt b/Tests/RunCMake/message/message-log-level-default-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-log-level-default-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-default-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-log-level-notice-stderr.txt b/Tests/RunCMake/message/message-log-level-notice-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-log-level-notice-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-notice-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-log-level-override-stderr.txt b/Tests/RunCMake/message/message-log-level-override-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-log-level-override-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-override-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-log-level-status-stderr.txt b/Tests/RunCMake/message/message-log-level-status-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-log-level-status-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-status-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-log-level-trace-stderr.txt b/Tests/RunCMake/message/message-log-level-trace-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-log-level-trace-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-trace-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-log-level-verbose-stderr.txt b/Tests/RunCMake/message/message-log-level-verbose-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-log-level-verbose-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-verbose-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-log-level-warning-stderr.txt b/Tests/RunCMake/message/message-log-level-warning-stderr.txt
index c31c9c1309..30b6b6be0e 100644
--- a/Tests/RunCMake/message/message-log-level-warning-stderr.txt
+++ b/Tests/RunCMake/message/message-log-level-warning-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-loglevel-debug-stderr.txt b/Tests/RunCMake/message/message-loglevel-debug-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-loglevel-debug-stderr.txt
+++ b/Tests/RunCMake/message/message-loglevel-debug-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-loglevel-default-stderr.txt b/Tests/RunCMake/message/message-loglevel-default-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-loglevel-default-stderr.txt
+++ b/Tests/RunCMake/message/message-loglevel-default-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-loglevel-notice-stderr.txt b/Tests/RunCMake/message/message-loglevel-notice-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-loglevel-notice-stderr.txt
+++ b/Tests/RunCMake/message/message-loglevel-notice-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-loglevel-status-stderr.txt b/Tests/RunCMake/message/message-loglevel-status-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-loglevel-status-stderr.txt
+++ b/Tests/RunCMake/message/message-loglevel-status-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-loglevel-trace-stderr.txt b/Tests/RunCMake/message/message-loglevel-trace-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-loglevel-trace-stderr.txt
+++ b/Tests/RunCMake/message/message-loglevel-trace-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-loglevel-verbose-stderr.txt b/Tests/RunCMake/message/message-loglevel-verbose-stderr.txt
index b4a3cc9170..672b700efa 100644
--- a/Tests/RunCMake/message/message-loglevel-verbose-stderr.txt
+++ b/Tests/RunCMake/message/message-loglevel-verbose-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/message-loglevel-warning-stderr.txt b/Tests/RunCMake/message/message-loglevel-warning-stderr.txt
index c31c9c1309..30b6b6be0e 100644
--- a/Tests/RunCMake/message/message-loglevel-warning-stderr.txt
+++ b/Tests/RunCMake/message/message-loglevel-warning-stderr.txt
@@ -1,5 +1,7 @@
 ^CMake Warning \(deprecated\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:2 \(message\):
   Deprecation warning
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Warning \(author\) at.*/Tests/RunCMake/message/message-all-loglevels\.cmake:3 \(message\):
   Author warning message
diff --git a/Tests/RunCMake/message/warnmessage-stderr.txt b/Tests/RunCMake/message/warnmessage-stderr.txt
index c080344e70..4b83580ad6 100644
--- a/Tests/RunCMake/message/warnmessage-stderr.txt
+++ b/Tests/RunCMake/message/warnmessage-stderr.txt
@@ -2,8 +2,9 @@
   This is a deprecation warning
 Call Stack \(most recent call first\):
   CMakeLists\.txt:3 \(include\)
-
-
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
++
 CMake Warning \(author\) at warnmessage\.cmake:8 \(message\):
   This is a author warning
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/option/CMP0077-OLD-stderr.txt b/Tests/RunCMake/option/CMP0077-OLD-stderr.txt
index 6d7506de95..4450772c83 100644
--- a/Tests/RunCMake/option/CMP0077-OLD-stderr.txt
+++ b/Tests/RunCMake/option/CMP0077-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/project/CMP0096-OLD-stderr.txt b/Tests/RunCMake/project/CMP0096-OLD-stderr.txt
index 97a43c0921..ee7b454a67 100644
--- a/Tests/RunCMake/project/CMP0096-OLD-stderr.txt
+++ b/Tests/RunCMake/project/CMP0096-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/project/VersionMax-stderr.txt b/Tests/RunCMake/project/VersionMax-stderr.txt
index f9e480a8f3..89de06155c 100644
--- a/Tests/RunCMake/project/VersionMax-stderr.txt
+++ b/Tests/RunCMake/project/VersionMax-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/return/CMP0140-OLD-stderr.txt b/Tests/RunCMake/return/CMP0140-OLD-stderr.txt
index f118d02b1b..a0ca8a2f5d 100644
--- a/Tests/RunCMake/return/CMP0140-OLD-stderr.txt
+++ b/Tests/RunCMake/return/CMP0140-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/target_compile_options/CMP0101-BEFORE_keyword-stderr.txt b/Tests/RunCMake/target_compile_options/CMP0101-BEFORE_keyword-stderr.txt
index 306c141966..583d56fb47 100644
--- a/Tests/RunCMake/target_compile_options/CMP0101-BEFORE_keyword-stderr.txt
+++ b/Tests/RunCMake/target_compile_options/CMP0101-BEFORE_keyword-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/target_link_libraries/CMP0079-iface-OLD-stderr.txt b/Tests/RunCMake/target_link_libraries/CMP0079-iface-OLD-stderr.txt
index 99dc92e3e9..25d4c5cc6d 100644
--- a/Tests/RunCMake/target_link_libraries/CMP0079-iface-OLD-stderr.txt
+++ b/Tests/RunCMake/target_link_libraries/CMP0079-iface-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/target_link_libraries/CMP0079-link-OLD-stderr.txt b/Tests/RunCMake/target_link_libraries/CMP0079-link-OLD-stderr.txt
index 129c00f95f..413057bb90 100644
--- a/Tests/RunCMake/target_link_libraries/CMP0079-link-OLD-stderr.txt
+++ b/Tests/RunCMake/target_link_libraries/CMP0079-link-OLD-stderr.txt
@@ -8,6 +8,8 @@
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 CMake Error at CMP0079-link/CMakeLists\.txt:[0-9]+ \(target_link_libraries\):
   Attempt to add link library "foo" to target "top" which is not built in
diff --git a/Tests/RunCMake/target_link_libraries/CMP0108-OLD-self-link-stderr.txt b/Tests/RunCMake/target_link_libraries/CMP0108-OLD-self-link-stderr.txt
index 40a840dedb..1fafb1883a 100644
--- a/Tests/RunCMake/target_link_libraries/CMP0108-OLD-self-link-stderr.txt
+++ b/Tests/RunCMake/target_link_libraries/CMP0108-OLD-self-link-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/try_compile/CMP0066-stderr.txt b/Tests/RunCMake/try_compile/CMP0066-stderr.txt
index dfd8e0cb61..65b9ed6b90 100644
--- a/Tests/RunCMake/try_compile/CMP0066-stderr.txt
+++ b/Tests/RunCMake/try_compile/CMP0066-stderr.txt
@@ -5,6 +5,8 @@
   Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
   to tell CMake that the project requires at least <min> but has been updated
   to work with policies introduced by <max> or earlier\.
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 before try_compile with CMP0066 WARN-default
 after try_compile with CMP0066 WARN-default
@@ -31,4 +33,6 @@ CMake Warning \(deprecated\) at CMP0066\.cmake:[0-9]+ \(cmake_policy\):
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$
diff --git a/Tests/RunCMake/try_compile/CMP0067-stderr.txt b/Tests/RunCMake/try_compile/CMP0067-stderr.txt
index d183992470..06d8767d7f 100644
--- a/Tests/RunCMake/try_compile/CMP0067-stderr.txt
+++ b/Tests/RunCMake/try_compile/CMP0067-stderr.txt
@@ -17,7 +17,7 @@ CMake Warning \(author\) at CMP0067\.cmake:[0-9]+ \(try_compile\):
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-author to suppress it\.
-
++
 after try_compile with CMP0067 WARN-enabled
 CMake Warning \(deprecated\) at CMP0067\.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0067 will be removed from a future version
@@ -29,6 +29,8 @@ CMake Warning \(deprecated\) at CMP0067\.cmake:[0-9]+ \(cmake_policy\):
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.
 +
 before try_compile with CMP0067 OLD
 after try_compile with CMP0067 OLD
diff --git a/Tests/RunCMake/while/CMP0130-OLD-stderr.txt b/Tests/RunCMake/while/CMP0130-OLD-stderr.txt
index d29bb42f9f..ff4f8274ac 100644
--- a/Tests/RunCMake/while/CMP0130-OLD-stderr.txt
+++ b/Tests/RunCMake/while/CMP0130-OLD-stderr.txt
@@ -7,4 +7,6 @@
   specific short-term circumstances\.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD\.
 Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-author or -Wno-deprecated
+to suppress it\.$