Browse Source

cmPolicies: Drop unnecessary check from ApplyPolicyVersion

This internal API is never called with `version_min` empty.
Brad King 7 years ago
parent
commit
1d00ed7cf7
1 changed files with 3 additions and 9 deletions
  1. 3 9
      Source/cmPolicies.cxx

+ 3 - 9
Source/cmPolicies.cxx

@@ -156,22 +156,16 @@ static bool GetPolicyDefault(cmMakefile* mf, std::string const& policy,
 bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf,
                                     std::string const& version_min)
 {
-  std::string ver = "2.4.0";
-
-  if (!version_min.empty()) {
-    ver = version_min;
-  }
-
   unsigned int majorVer = 2;
   unsigned int minorVer = 0;
   unsigned int patchVer = 0;
   unsigned int tweakVer = 0;
 
   // parse the string
-  if (sscanf(ver.c_str(), "%u.%u.%u.%u", &majorVer, &minorVer, &patchVer,
-             &tweakVer) < 2) {
+  if (sscanf(version_min.c_str(), "%u.%u.%u.%u", &majorVer, &minorVer,
+             &patchVer, &tweakVer) < 2) {
     std::ostringstream e;
-    e << "Invalid policy version value \"" << ver << "\".  "
+    e << "Invalid policy version value \"" << version_min << "\".  "
       << "A numeric major.minor[.patch[.tweak]] must be given.";
     mf->IssueMessage(cmake::FATAL_ERROR, e.str());
     return false;