summaryrefslogtreecommitdiff
path: root/Source/cmCMakeMinimumRequired.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmCMakeMinimumRequired.cxx')
-rw-r--r--Source/cmCMakeMinimumRequired.cxx12
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx
index 9a96093614..e618c1b3d8 100644
--- a/Source/cmCMakeMinimumRequired.cxx
+++ b/Source/cmCMakeMinimumRequired.cxx
@@ -30,8 +30,18 @@ bool cmCMakeMinimumRequired::InitialPass(std::vector<std::string> const& args)
}
float version = float(m_Makefile->GetMajorVersion());
version += (float(m_Makefile->GetMinorVersion()) * (float).1);
+ version += (float(m_Makefile->GetPatchVersion()) * (float).01);
float reqVersion = 0;
- sscanf(args[1].c_str(), "%f", &reqVersion);
+ int major=0;
+ int minor=0;
+ int patch=0;
+
+ int res=sscanf(args[1].c_str(), "%d.%d.%d", &major, &minor, &patch);
+ if (res==3)
+ reqVersion=float(major)+0.1*float(minor)+0.01*float(patch);
+ else if (res==2)
+ reqVersion=float(major)+0.1*float(minor);
+
if(reqVersion > version)
{
cmOStringStream str;