This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 7309669cc1a57fcde79114d03f333db2a1af872e (commit)
via 447a04c31c7540882fb823df0890450e677083ee (commit)
from ff3dab4cf76f07492e2be677c2847286ac70be2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7309669cc1a57fcde79114d03f333db2a1af872e
commit 7309669cc1a57fcde79114d03f333db2a1af872e
Merge: ff3dab4 447a04c
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Nov 15 11:05:33 2010 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 15 11:05:33 2010 -0500
Merge topic 'dev/strict-mode' into next
447a04c Don't warn during configure when doing everything
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=447a04c31c7540882fb823df0890450e677083ee
commit 447a04c31c7540882fb823df0890450e677083ee
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Nov 15 11:01:19 2010 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Mon Nov 15 11:03:48 2010 -0500
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.
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();
-----------------------------------------------------------------------
Summary of changes:
Source/cmake.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
