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

BUG: Fixed GetCacheMinorVersion to not always return 0.

This commit is contained in:
Brad King 2005-02-24 10:31:17 -05:00
parent 33024e8ff6
commit df301a2542
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmMakefile.cxx
View File

@ -90,20 +90,30 @@ const char* cmMakefile::GetReleaseVersion()
unsigned int cmMakefile::GetCacheMajorVersion() unsigned int cmMakefile::GetCacheMajorVersion()
{ {
if(!this->GetCacheManager()->GetCacheValue("CMAKE_CACHE_MAJOR_VERSION")) if(const char* vstr =
this->GetCacheManager()->GetCacheValue("CMAKE_CACHE_MAJOR_VERSION"))
{ {
return 0; unsigned int v=0;
if(sscanf(vstr, "%u", &v) == 1)
{
return v;
} }
return atoi(this->GetCacheManager()->GetCacheValue("CMAKE_CACHE_MAJOR_VERSION")); }
return 0;
} }
unsigned int cmMakefile::GetCacheMinorVersion() unsigned int cmMakefile::GetCacheMinorVersion()
{ {
if(!this->GetCacheManager()->GetCacheValue("Cmake_Cache_MINOR_VERSION")) if(const char* vstr =
this->GetCacheManager()->GetCacheValue("CMAKE_CACHE_MINOR_VERSION"))
{ {
return 0; unsigned int v=0;
if(sscanf(vstr, "%u", &v) == 1)
{
return v;
} }
return atoi(this->GetCacheManager()->GetCacheValue("CMAKE_CACHE_MINOR_VERSION")); }
return 0;
} }