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/cmMakefile.cxx | |
| 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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 5850f94..c270629 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1490,7 +1490,7 @@ void cmMakefile::Configure() this->SetCheckCMP0000(true); // Implicitly set the version for the user. - this->SetPolicyVersion("2.4"); + this->SetPolicyVersion("2.4", std::string()); } } bool hasProject = false; @@ -4175,9 +4175,10 @@ void cmMakefile::PopSnapshot(bool reportError) assert(this->StateSnapshot.IsValid()); } -bool cmMakefile::SetPolicyVersion(const char* version) +bool cmMakefile::SetPolicyVersion(std::string const& version_min, + std::string const& version_max) { - return cmPolicies::ApplyPolicyVersion(this, version); + return cmPolicies::ApplyPolicyVersion(this, version_min, version_max); } bool cmMakefile::HasCMP0054AlreadyBeenReported( |