diff options
author | Brad King <brad.king@kitware.com> | 2018-03-16 15:56:54 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-03-16 16:06:04 (GMT) |
commit | 0df559832bdc629df333b57c798d42e77716a94b (patch) | |
tree | f366843e9dd59e516b3e6bfb2a1761d594c5b945 /Source/cmPolicies.cxx | |
parent | b3e668ea25d35a04adc41e17cfb4c8ab7a97a7d9 (diff) | |
download | CMake-0df559832bdc629df333b57c798d42e77716a94b.zip CMake-0df559832bdc629df333b57c798d42e77716a94b.tar.gz CMake-0df559832bdc629df333b57c798d42e77716a94b.tar.bz2 |
cmPolicies: Pass policy version as std::string
Diffstat (limited to 'Source/cmPolicies.cxx')
-rw-r--r-- | Source/cmPolicies.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index e7d1b72..7e3bd78 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -153,12 +153,13 @@ static bool GetPolicyDefault(cmMakefile* mf, std::string const& policy, return true; } -bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, const char* version) +bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, + std::string const& version_min) { std::string ver = "2.4.0"; - if (version && strlen(version) > 0) { - ver = version; + if (!version_min.empty()) { + ver = version_min; } unsigned int majorVer = 2; @@ -200,7 +201,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, const char* version) tweakVer > cmVersion::GetTweakVersion())) { std::ostringstream e; e << "An attempt was made to set the policy version of CMake to \"" - << version << "\" which is greater than this version of CMake. " + << version_min << "\" which is greater than this version of CMake. " << "This is not allowed because the greater version may have new " << "policies not known to this CMake. " << "You may need a newer CMake version to build this project."; |