summaryrefslogtreecommitdiffstats
path: root/Source/cmPolicies.cxx
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2010-12-15 21:24:05 (GMT)
committerBrad King <brad.king@kitware.com>2011-01-04 13:19:33 (GMT)
commit7db8db5b7279a74aa4eab9cc1996a6a94131dc7e (patch)
tree6ae52f1f97d10175521c4db5428af28fa592e663 /Source/cmPolicies.cxx
parentdb44848f441673909e909755d7b833aa474791c7 (diff)
downloadCMake-7db8db5b7279a74aa4eab9cc1996a6a94131dc7e.zip
CMake-7db8db5b7279a74aa4eab9cc1996a6a94131dc7e.tar.gz
CMake-7db8db5b7279a74aa4eab9cc1996a6a94131dc7e.tar.bz2
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
Diffstat (limited to 'Source/cmPolicies.cxx')
-rw-r--r--Source/cmPolicies.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 34c74c2..2d1f792 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()