diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-11 20:56:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-11 20:56:59 (GMT) |
| commit | 784d5ce0f8bf630901dece526df7ce663da17e6a (patch) | |
| tree | 0b4647ace5986304b15b3f900fee969e278f33db /Source/cmPolicies.h | |
| parent | 2d3594b1bbd48d0dc7a071a6806c75c89341e1c5 (diff) | |
| parent | ce28737c933a749cbc84c601f3ac9f56e4c832aa (diff) | |
| download | CMake-784d5ce0f8bf630901dece526df7ce663da17e6a.zip CMake-784d5ce0f8bf630901dece526df7ce663da17e6a.tar.gz CMake-784d5ce0f8bf630901dece526df7ce663da17e6a.tar.bz2 | |
Merge branch 'policy-CMP0017' into resolve/python-versions/policy-CMP0017
Conflicts:
Modules/FindPythonInterp.cmake
Diffstat (limited to 'Source/cmPolicies.h')
| -rw-r--r-- | Source/cmPolicies.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index fce33ac..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. @@ -102,6 +103,10 @@ public: void DiagnoseAncientPolicies(std::vector<PolicyID> const& ancient, unsigned int majorVer, unsigned int minorVer, unsigned int patchVer, cmMakefile* mf); + + bool GetPolicyDefault(cmMakefile* mf, std::string const& policy, + cmPolicies::PolicyStatus* defaultStatus); + }; #endif |