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 9470d1e8bbcdd258fae66165f9cfdb76b7175179 (commit)
via 1dda2ec55a07f2a51d09f7b1604707e690e884b5 (commit)
from f7e7afe9d54fac4527c70e0b8a9c463aae3cc4de (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9470d1e8bbcdd258fae66165f9cfdb76b7175179
commit 9470d1e8bbcdd258fae66165f9cfdb76b7175179
Merge: f7e7afe 1dda2ec
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 30 13:53:53 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 30 13:53:53 2016 -0400
Merge topic 'syntax-unexpected-eof' into next
1dda2ec5 Improve error message on unexpected end of file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dda2ec55a07f2a51d09f7b1604707e690e884b5
commit 1dda2ec55a07f2a51d09f7b1604707e690e884b5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 30 13:36:51 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Aug 30 13:53:15 2016 -0400
Improve error message on unexpected end of file
Suggested-by: Stephen Kelly <steve...@gmail.com>
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 3c5e333..aad538c 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -163,8 +163,7 @@ bool cmListFileParser::ParseFunction(const char* name, long
line)
if (!token) {
std::ostringstream error;
/* clang-format off */
- error << "Error in cmake code at\n" << this->FileName << ":"
- << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n"
+ error << "Unexpected end of file.\n"
<< "Parse error. Function missing opening \"(\".";
/* clang-format on */
this->IssueError(error.str());
diff --git a/Tests/RunCMake/Syntax/CommandEOF-result.txt
b/Tests/RunCMake/Syntax/CommandEOF-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CommandEOF-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/CommandEOF-stderr.txt
b/Tests/RunCMake/Syntax/CommandEOF-stderr.txt
new file mode 100644
index 0000000..31cbc08
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CommandEOF-stderr.txt
@@ -0,0 +1,6 @@
+^CMake Error in CommandEOF.cmake:
+ Unexpected end of file.
+
+ Parse error. Function missing opening "\(".
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/CommandEOF.cmake
b/Tests/RunCMake/Syntax/CommandEOF.cmake
new file mode 100644
index 0000000..36ebb02
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CommandEOF.cmake
@@ -0,0 +1 @@
+message
\ No newline at end of file
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index fd012b9..d1fbb16 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -17,6 +17,7 @@ run_cmake(CommandSpaces)
run_cmake(CommandTabs)
run_cmake(CommandNewlines)
run_cmake(CommandComments)
+run_cmake(CommandEOF)
run_cmake(CommandError0)
run_cmake(CommandError1)
run_cmake(CommandError2)
-----------------------------------------------------------------------
Summary of changes:
Source/cmListFileCache.cxx | 3 +--
.../BadSYSROOT-result.txt => Syntax/CommandEOF-result.txt} | 0
Tests/RunCMake/Syntax/CommandEOF-stderr.txt | 6 ++++++
Tests/RunCMake/Syntax/CommandEOF.cmake | 1 +
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 1 +
5 files changed, 9 insertions(+), 2 deletions(-)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt =>
Syntax/CommandEOF-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/CommandEOF-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/CommandEOF.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
