diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-03-22 19:24:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-22 19:24:49 (GMT) |
| commit | 82df2fe17e81fa4efa9717ec9d83d2915d56aa33 (patch) | |
| tree | c2d28d7e62d15ed1052fc1f4f2c20a7300190bf6 /Source/cmPolicies.h | |
| parent | 8aec07e0576a6121174a210dd3e3440a9f7105aa (diff) | |
| parent | 45408b5ea1e3654b5d4f6289ca1a0b5c0f1ac4e9 (diff) | |
| download | CMake-82df2fe17e81fa4efa9717ec9d83d2915d56aa33.zip CMake-82df2fe17e81fa4efa9717ec9d83d2915d56aa33.tar.gz CMake-82df2fe17e81fa4efa9717ec9d83d2915d56aa33.tar.bz2 | |
Merge topic 'policy-version-range'
45408b5ea1 cmake_minimum_required: Optionally set policies with version range
6a41aa2abd cmPolicies: Split parsing and impl of ApplyPolicyVersion
1d00ed7cf7 cmPolicies: Drop unnecessary check from ApplyPolicyVersion
0df559832b cmPolicies: Pass policy version as std::string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1864
Diffstat (limited to 'Source/cmPolicies.h')
| -rw-r--r-- | Source/cmPolicies.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index 34fe09d..a21c778 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -290,7 +290,11 @@ public: static cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id); ///! Set a policy level for this listfile - static bool ApplyPolicyVersion(cmMakefile* mf, const char* version); + static bool ApplyPolicyVersion(cmMakefile* mf, + std::string const& version_min, + std::string const& version_max); + static bool ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer, + unsigned int minorVer, unsigned int patchVer); ///! return a warning string for a given policy static std::string GetPolicyWarning(cmPolicies::PolicyID id); |