Forráskód Böngészése

Don't warn during configure when doing everything

This prevents warnings from being generated after configure *and* after
generation if both are going to be run anyways.
Ben Boeckel 15 éve
szülő
commit
447a04c31c
1 módosított fájl, 6 hozzáadás és 0 törlés
  1. 6 0
      Source/cmake.cxx

+ 6 - 0
Source/cmake.cxx

@@ -2292,6 +2292,11 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
   std::string oldstartoutputdir = this->GetStartOutputDirectory();
   this->SetStartDirectory(this->GetHomeDirectory());
   this->SetStartOutputDirectory(this->GetHomeOutputDirectory());
+  const bool warncli = this->WarnUnusedCli;
+  if (!this->ScriptMode)
+    {
+    this->WarnUnusedCli = false;
+    }
   int ret = this->Configure();
   if (ret || this->ScriptMode)
     {
@@ -2313,6 +2318,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
 #endif
     return ret;
     }
+  this->WarnUnusedCli = warncli;
   ret = this->Generate();
   std::string message = "Build files have been written to: ";
   message += this->GetHomeOutputDirectory();