kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Require policy version to specify at least major.minor. Do not store CMAKE_BACKWARDS_COMPATIBILITY with an invalid version value.

This commit is contained in:
Brad King 2008-03-05 18:20:20 -05:00
parent 95512a4c02
commit 7c01167666
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmPolicies.cxx
View File

@ -177,8 +177,11 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
unsigned int patchVer = 0; unsigned int patchVer = 0;
// parse the string // parse the string
sscanf(ver.c_str(), "%u.%u.%u", if(sscanf(ver.c_str(), "%u.%u.%u",
&majorVer, &minorVer, &patchVer); &majorVer, &minorVer, &patchVer) < 2)
{
return false;
}
// add in the old CMAKE_BACKWARDS_COMPATIBILITY var for old CMake compatibility // add in the old CMAKE_BACKWARDS_COMPATIBILITY var for old CMake compatibility
if ((majorVer == 2 && minorVer <= 4) || majorVer < 2) if ((majorVer == 2 && minorVer <= 4) || majorVer < 2)
@ -186,8 +189,10 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
if (!mf->GetCacheManager()-> if (!mf->GetCacheManager()->
GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY")) GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{ {
cmOStringStream v;
v << majorVer << "." << minorVer << "." << patchVer;
mf->AddCacheDefinition mf->AddCacheDefinition
("CMAKE_BACKWARDS_COMPATIBILITY",version, ("CMAKE_BACKWARDS_COMPATIBILITY", v.str().c_str(),
"For backwards compatibility, what version of CMake commands and " "For backwards compatibility, what version of CMake commands and "
"syntax should this version of CMake try to support.", "syntax should this version of CMake try to support.",
cmCacheManager::STRING); cmCacheManager::STRING);