[Cmake-commits] CMake branch, next, updated. v2.8.3-742-g46386b0
Ben Boeckel
ben.boeckel at kitware.com
Fri Dec 3 12:56:44 EST 2010
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 46386b0ccd40f57c9eb4ad3f04f91f8b6080d0bc (commit)
via 3c3b98ddd384214d191c1b061f8c7eba6845810d (commit)
via cf8b15a5c1eb32f756cf76f06fd18c23241dd103 (commit)
via fd50f06b215f81f2ee28ae8afab32d0b3049fac5 (commit)
from bed315495af208c0db005dc74f86adce0cc99107 (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=46386b0ccd40f57c9eb4ad3f04f91f8b6080d0bc
commit 46386b0ccd40f57c9eb4ad3f04f91f8b6080d0bc
Merge: bed3154 3c3b98d
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Dec 3 12:56:43 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 3 12:56:43 2010 -0500
Merge topic 'dev/strict-mode' into next
3c3b98d Initialize the class before setting warn flags
cf8b15a Ignore files under the CMakeFiles directory
fd50f06 Don't check for unused vars at configure time
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c3b98ddd384214d191c1b061f8c7eba6845810d
commit 3c3b98ddd384214d191c1b061f8c7eba6845810d
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Dec 3 12:52:36 2010 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Dec 3 12:52:36 2010 -0500
Initialize the class before setting warn flags
Since Initialize sets variables that we don't want to warn about, don't
leak the original class' settings.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index feeee2f..ed435da 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -141,9 +141,9 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
this->Properties = mf.Properties;
this->PreOrder = mf.PreOrder;
this->WarnUnused = mf.WarnUnused;
+ this->Initialize();
this->CheckSystemVars = mf.CheckSystemVars;
this->ListFileStack = mf.ListFileStack;
- this->Initialize();
}
//----------------------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf8b15a5c1eb32f756cf76f06fd18c23241dd103
commit cf8b15a5c1eb32f756cf76f06fd18c23241dd103
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Dec 3 12:49:37 2010 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Dec 3 12:49:37 2010 -0500
Ignore files under the CMakeFiles directory
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 82b0129..feeee2f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1793,8 +1793,10 @@ void cmMakefile::CheckForUnused(const char* reason, const char* name) const
if (this->CheckSystemVars ||
cmSystemTools::IsSubDirectory(path.c_str(),
this->GetHomeDirectory()) ||
- cmSystemTools::IsSubDirectory(path.c_str(),
- this->GetHomeOutputDirectory()))
+ (cmSystemTools::IsSubDirectory(path.c_str(),
+ this->GetHomeOutputDirectory()) &&
+ !cmSystemTools::IsSubDirectory(path.c_str(),
+ cmake::GetCMakeFilesDirectory())))
{
cmOStringStream msg;
msg << path << ":" << line << ":" <<
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd50f06b215f81f2ee28ae8afab32d0b3049fac5
commit fd50f06b215f81f2ee28ae8afab32d0b3049fac5
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Dec 2 16:57:30 2010 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Dec 2 16:57:30 2010 -0500
Don't check for unused vars at configure time
The generate step should catch all of them.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9ecc988..82b0129 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -831,8 +831,6 @@ void cmMakefile::ConfigureFinalPass()
{
l->second.FinishConfigure();
}
-
- this->GetCMakeInstance()->RunCheckForUnusedVariables("configure");
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list