diff options
| author | Brad King <brad.king@kitware.com> | 2005-06-17 09:49:06 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-06-17 09:49:06 -0400 |
| commit | 65e2c18d736f00cccafd6d13f9dcb3b42e2ce969 (patch) | |
| tree | 9f86e7a33ea9bc22bf29634e16ab146eeda3ee0e | |
| parent | 6c1a83609e16d13a110b39dd6078275236040699 (diff) | |
| download | cmake-65e2c18d736f00cccafd6d13f9dcb3b42e2ce969.tar.gz | |
ENH: Enabling ability for CMAKE_MINIMUM_REQUIRED version to include patch level. Submitted by Alexander Neundorf.
| -rw-r--r-- | Source/cmCMakeMinimumRequired.cxx | 12 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 1 | ||||
| -rw-r--r-- | Source/cmVersion.h | 1 |
3 files changed, 13 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; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 5d00c9330b..e8b159c56b 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -50,6 +50,7 @@ public: */ static unsigned int GetMajorVersion() { return CMake_VERSION_MAJOR; } static unsigned int GetMinorVersion() { return CMake_VERSION_MINOR; } + static unsigned int GetPatchVersion() { return CMake_VERSION_PATCH; } static const char* GetReleaseVersion(); /** diff --git a/Source/cmVersion.h b/Source/cmVersion.h index 92ed9882d0..29eb9d19bc 100644 --- a/Source/cmVersion.h +++ b/Source/cmVersion.h @@ -32,6 +32,7 @@ public: */ static unsigned int GetMajorVersion() { return CMake_VERSION_MAJOR; } static unsigned int GetMinorVersion() { return CMake_VERSION_MINOR; } + static unsigned int GetPatchVersion() { return CMake_VERSION_PATCH; } static std::string GetReleaseVersion(); static std::string GetCMakeVersion(); }; |