diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2010-11-15 16:01:19 (GMT) |
---|---|---|
committer | Ben Boeckel <ben.boeckel@kitware.com> | 2010-11-15 16:03:48 (GMT) |
commit | 447a04c31c7540882fb823df0890450e677083ee (patch) | |
tree | 01ec4d3280b0412480c3e4ae431c11f81010e569 /Source | |
parent | b97ee21fc65487f4b55ac8e5054aeddb33d5127e (diff) | |
download | CMake-447a04c31c7540882fb823df0890450e677083ee.zip CMake-447a04c31c7540882fb823df0890450e677083ee.tar.gz CMake-447a04c31c7540882fb823df0890450e677083ee.tar.bz2 |
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.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmake.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 5d910d0..d9217ff 100644 --- a/Source/cmake.cxx +++ b/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(); |