diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-09 13:01:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-09 13:01:08 (GMT) |
| commit | 7ecd9648a166ecf500badfd0c4eab77a15101c35 (patch) | |
| tree | 29dba5c66e0b210f846e64b64f2af21e8fcddc1e /Source/cmListFileCache.cxx | |
| parent | 488b82f8ccca4de8a052b94ddf2be131682561cb (diff) | |
| parent | afca373510b5303d55fde17085718323ea9b2cb9 (diff) | |
| download | CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.zip CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.tar.gz CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.tar.bz2 | |
Merge topic 'clang-format-prep'
afca3735 Help clang-format wrap after braces on long initializer lists
85425a3e Move comments off of class access specifier lines
64b55203 Isolate formatted streaming blocks with clang-format off/on
Diffstat (limited to 'Source/cmListFileCache.cxx')
| -rw-r--r-- | Source/cmListFileCache.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 5a16104..0efe099 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -261,9 +261,11 @@ 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" << "Parse error. Function missing opening \"(\"."; + /* clang-format on */ cmSystemTools::Error(error.str().c_str()); return false; } @@ -382,10 +384,12 @@ bool cmListFileParser::AddArgument(cmListFileLexer_Token* token, bool isError = (this->Separation == SeparationError || delim == cmListFileArgument::Bracket); std::ostringstream m; + /* clang-format off */ m << "Syntax " << (isError? "Error":"Warning") << " in cmake code at\n" << " " << this->FileName << ":" << token->line << ":" << token->column << "\n" << "Argument not separated from preceding token by whitespace."; + /* clang-format on */ if(isError) { this->Makefile->IssueMessage(cmake::FATAL_ERROR, m.str()); |