diff options
| author | Alex Neundorf <neundorf@kde.org> | 2010-11-17 21:32:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-04 13:06:20 (GMT) |
| commit | db44848f441673909e909755d7b833aa474791c7 (patch) | |
| tree | ac9f6a49c40a6c050947237d1d470e96b8cb7468 /Source/cmPolicies.h | |
| parent | 1e69c6f37fa4a3a1a0c2f8fa665ad07a78fed580 (diff) | |
| download | CMake-db44848f441673909e909755d7b833aa474791c7.zip CMake-db44848f441673909e909755d7b833aa474791c7.tar.gz CMake-db44848f441673909e909755d7b833aa474791c7.tar.bz2 | |
Prefer files from CMAKE_ROOT when including from CMAKE_ROOT
This patch makes include() and find_package() prefer cmake files
located in CMAKE_ROOT over those in CMAKE_MODULE_PATH.
This makes sure that the including file gets that file included
which it expects, i.e. the one from cmake with which it was tested.
It only changes behaviour when such an included file exists both
in CMAKE_MODULE_PATH and in CMAKE_ROOT.
This comes together with a new policy CMP0017, with default
behaviour it behaves as it always did, but warns.
With NEW behaviour it includes the file from CMAKE_ROOT
instead from CMAKE_MODULE_PATH. This fixes (if CMP0017 is set)
building KDE 4.5 with cmake >= 2.8.3.
Also a basic test for this policy in included.
Diffstat (limited to 'Source/cmPolicies.h')
| -rw-r--r-- | Source/cmPolicies.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index 87eb646..2160f37 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -52,6 +52,7 @@ public: CMP0014, // Input directories must have CMakeLists.txt CMP0015, // link_directories() treats paths relative to source dir CMP0016, // target_link_libraries() fails if only argument is not a target + CMP0017, // Prefer files in CMAKE_ROOT when including from CMAKE_ROOT // Always the last entry. Useful mostly to avoid adding a comma // the last policy when adding a new one. |