[Cmake-commits] CMake branch, next, updated. v2.8.2-1027-g7143d44
Ben Boeckel
ben.boeckel at kitware.com
Thu Oct 7 12:24:42 EDT 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 7143d44ef520df02e33ef23ceb57a3f4e99dbfb6 (commit)
via d4ee998b61cf3c16e9e04da2173490589790a894 (commit)
from 8d5237e469b64faa37c69ef889ee23a46aa18f58 (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=7143d44ef520df02e33ef23ceb57a3f4e99dbfb6
commit 7143d44ef520df02e33ef23ceb57a3f4e99dbfb6
Merge: 8d5237e d4ee998
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Oct 7 12:24:41 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 7 12:24:41 2010 -0400
Merge topic 'dev/strict-mode' into next
d4ee998 Hard-code the --no-warn-unused-cli flag
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4ee998b61cf3c16e9e04da2173490589790a894
commit d4ee998b61cf3c16e9e04da2173490589790a894
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Oct 7 12:22:00 2010 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Oct 7 12:22:00 2010 -0400
Hard-code the --no-warn-unused-cli flag
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a4a79be..ed34569 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2810,7 +2810,11 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
// if cmake args were provided then pass them in
if (cmakeArgs)
{
- cm.SetArgs(*cmakeArgs, true);
+ // FIXME: Workaround to ignore unused CLI variables until the
+ // 'ArgumentExpansion' test succeeds with CMAKE_STRICT on
+ cm.SetWarnUnusedCli(true);
+ //cm.SetArgs(*cmakeArgs, true);
+
cm.SetCacheArgs(*cmakeArgs);
}
// to save time we pass the EnableLanguage info directly
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list