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 3d819053cb3c19ee8ab39f62360e9f600ac77df0 (commit)
via 0cc53a67cca45ab0a15ab193ad54778977b25400 (commit)
from 7cf3c720d7336cb52d1bd8c61170c1915cfdcc6e (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=3d819053cb3c19ee8ab39f62360e9f600ac77df0
commit 3d819053cb3c19ee8ab39f62360e9f600ac77df0
Merge: 7cf3c72 0cc53a6
Author: Peter Kuemmel <syntheti...@gmx.net>
AuthorDate: Tue Jul 10 10:13:08 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jul 10 10:13:08 2012 -0400
Merge topic 'include-command-empty-filename' into next
0cc53a6 don't add empty strings as included cmake files, print a warning
instead
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cc53a67cca45ab0a15ab193ad54778977b25400
commit 0cc53a67cca45ab0a15ab193ad54778977b25400
Author: Peter Kümmel <syntheti...@gmx.net>
AuthorDate: Tue Jul 10 16:05:51 2012 +0200
Commit: Peter Kümmel <syntheti...@gmx.net>
CommitDate: Tue Jul 10 16:08:02 2012 +0200
don't add empty strings as included cmake files, print a warning instead
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 0ac6df4..d6fdb71 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -31,6 +31,14 @@ bool cmIncludeCommand
{
if (args[i] == "OPTIONAL")
{
+ if (fname.empty())
+ {
+ // do nothing when no file name is given
+ // because of OPTIONAL don't handle it as error
+ this->Makefile->IssueMessage(cmake::AUTHOR_WARNING,
+ "In command 'include(<filename> OPTIONAL)' <filename> is
empty.");
+ return true;
+ }
if (optional)
{
this->SetError("called with invalid arguments: OPTIONAL used twice");
-----------------------------------------------------------------------
Summary of changes:
Source/cmIncludeCommand.cxx | 8 ++++++++
1 files changed, 8 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
