From 7db8db5b7279a74aa4eab9cc1996a6a94131dc7e Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Wed, 15 Dec 2010 22:24:05 +0100
Subject: [PATCH] Improve documentation and messages for the new CMP0017

This patch incorporates the comments from Brad:
-some improvements to the documentation of CMP0017
-make the test QUIETLY search for zlib
---
 Source/cmIncludeCommand.h            |  3 +--
 Source/cmPolicies.cxx                | 17 +++++++++--------
 Tests/FindPackageTest/CMakeLists.txt |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h
index a6d43ba17..d933ef3f6 100644
--- a/Source/cmIncludeCommand.h
+++ b/Source/cmIncludeCommand.h
@@ -77,8 +77,7 @@ public:
       "CMake module directory. There is one exception to this: if the file "
       "which calls include() is located itself in the CMake module directory, "
       "then first the CMake module directory is searched and "
-      "CMAKE_MODULE_PATH afterwards. This behaviour is controlled by policy "
-      "CMP0017."
+      "CMAKE_MODULE_PATH afterwards. See also policy CMP0017."
       "\n"
       "See the cmake_policy() command documentation for discussion of the "
       "NO_POLICY_SCOPE option."
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 34c74c2e7..2d1f79212 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -449,19 +449,20 @@ cmPolicies::cmPolicies()
 
     this->DefinePolicy(
     CMP0017, "CMP0017",
-    "Prefer files from CMAKE_ROOT/ when including from CMAKE_ROOT.",
-    "Starting with CMake 2.8.3, if a cmake-module shipped with CMake (i.e. "
-    "located in CMAKE_ROOT/Modules/) calls include() or find_package(), "
-    "the files located in CMAKE_ROOT/Modules/ are prefered over the files "
-    "in CMAKE_MODULE_PATH.  This makes sure that the modules belonging to "
+    "Prefer files from the CMake module directory when including from there.",
+    "Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e. "
+    "located in the CMake module directory) calls include() or "
+    "find_package(), the files located in the the CMake module directory are "
+    "prefered over the files in CMAKE_MODULE_PATH.  "
+    "This makes sure that the modules belonging to "
     "CMake always get those files included which they expect, and against "
     "which they were developed and tested.  "
     "In call other cases, the files found in "
     "CMAKE_MODULE_PATH still take precedence over the ones in "
-    "CMAKE_ROOT/Modules/.  "
+    "the CMake module directory.  "
     "The OLD behaviour is to always prefer files from CMAKE_MODULE_PATH over "
-    "files from CMAKE_ROOT/Modules/.",
-    2,8,3,0, cmPolicies::WARN);
+    "files from the CMake modules directory.",
+    2,8,4,0, cmPolicies::WARN);
 }
 
 cmPolicies::~cmPolicies()
diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt
index fb121211b..f420f4bd5 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -8,7 +8,7 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 # because otherwise FindPackageHandleStandardArgs.cmake from the current
 # directory is included (via CMAKE_MODULE_PATH).
 CMAKE_POLICY(SET CMP0017 NEW)
-FIND_PACKAGE(ZLIB)
+FIND_PACKAGE(ZLIB QUIET)
 
 # Look for a package that has a find module and may be found.
 FIND_PACKAGE(OpenGL QUIET)