Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 21:40:15 +08:00
Code Issues Projects Releases Wiki Activity

cmPolicies: Pass policy version as std::string

Browse Source
This commit is contained in:
Brad King
2018-03-16 11:56:54 -04:00
parent b3e668ea25
commit 0df559832b
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@@ -4149,9 +4149,9 @@ void cmMakefile::PopSnapshot(bool reportError)
assert(this->StateSnapshot.IsValid()); assert(this->StateSnapshot.IsValid());
} }
bool cmMakefile::SetPolicyVersion(const char* version) bool cmMakefile::SetPolicyVersion(std::string const& version_min)
{ {
return cmPolicies::ApplyPolicyVersion(this, version); return cmPolicies::ApplyPolicyVersion(this, version_min);
} }
bool cmMakefile::HasCMP0054AlreadyBeenReported( bool cmMakefile::HasCMP0054AlreadyBeenReported(

2
Source/cmMakefile.h
View File

@@ -285,7 +285,7 @@ public:
bool SetPolicy(cmPolicies::PolicyID id, cmPolicies::PolicyStatus status); bool SetPolicy(cmPolicies::PolicyID id, cmPolicies::PolicyStatus status);
bool SetPolicy(const char* id, cmPolicies::PolicyStatus status); bool SetPolicy(const char* id, cmPolicies::PolicyStatus status);
cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id) const; cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id) const;
bool SetPolicyVersion(const char* version); bool SetPolicyVersion(std::string const& version_min);
void RecordPolicies(cmPolicies::PolicyMap& pm); void RecordPolicies(cmPolicies::PolicyMap& pm);
//@} //@}

9
Source/cmPolicies.cxx
View File

@@ -153,12 +153,13 @@ static bool GetPolicyDefault(cmMakefile* mf, std::string const& policy,
return true; 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"; std::string ver = "2.4.0";
if (version && strlen(version) > 0) { if (!version_min.empty()) {
ver = version; ver = version_min;
} }
unsigned int majorVer = 2; unsigned int majorVer = 2;
@@ -200,7 +201,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, const char* version)
tweakVer > cmVersion::GetTweakVersion())) { tweakVer > cmVersion::GetTweakVersion())) {
std::ostringstream e; std::ostringstream e;
e << "An attempt was made to set the policy version of CMake to \"" 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 " << "This is not allowed because the greater version may have new "
<< "policies not known to this CMake. " << "policies not known to this CMake. "
<< "You may need a newer CMake version to build this project."; << "You may need a newer CMake version to build this project.";

3
Source/cmPolicies.h
View File

@@ -288,7 +288,8 @@ public:
static cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id); static cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id);
///! Set a policy level for this listfile ///! 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);
///! return a warning string for a given policy ///! return a warning string for a given policy
static std::string GetPolicyWarning(cmPolicies::PolicyID id); static std::string GetPolicyWarning(cmPolicies::PolicyID id);