diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-15 14:52:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-15 14:52:45 (GMT) |
| commit | 8da09f6ee1a59cbef6327d2a88ab8ba5f8b29b1a (patch) | |
| tree | 29d2dadf534144f7892cdce95020bcd1983e5264 | |
| parent | d4daaa54e846558aadc0c7e144cd792bc513ce05 (diff) | |
| parent | 9040ec91173824b27dd946d7bd36cc9c07268d74 (diff) | |
| download | CMake-8da09f6ee1a59cbef6327d2a88ab8ba5f8b29b1a.zip CMake-8da09f6ee1a59cbef6327d2a88ab8ba5f8b29b1a.tar.gz CMake-8da09f6ee1a59cbef6327d2a88ab8ba5f8b29b1a.tar.bz2 | |
Merge topic 'cmake-syntax'
9040ec9 Do not warn about left paren not separated by a space
| -rw-r--r-- | Source/cmListFileCache.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/ParenNoSpace.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/RunCMakeTest.cmake | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index c02866c..898f379 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -287,8 +287,8 @@ bool cmListFileParser::ParseFunction(const char* name, long line) if(token->type == cmListFileLexer_Token_ParenLeft) { parenDepth++; - this->AddArgument(token, cmListFileArgument::Unquoted); this->Separation = SeparationOkay; + this->AddArgument(token, cmListFileArgument::Unquoted); } else if(token->type == cmListFileLexer_Token_ParenRight) { diff --git a/Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt b/Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt new file mode 100644 index 0000000..10f3293 --- /dev/null +++ b/Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt @@ -0,0 +1 @@ +^$ diff --git a/Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt b/Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt new file mode 100644 index 0000000..72addd7 --- /dev/null +++ b/Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt @@ -0,0 +1,2 @@ +-- unquoted\(unquoted\) +-- quoted\(quoted\) diff --git a/Tests/RunCMake/Syntax/ParenNoSpace.cmake b/Tests/RunCMake/Syntax/ParenNoSpace.cmake new file mode 100644 index 0000000..c690d96 --- /dev/null +++ b/Tests/RunCMake/Syntax/ParenNoSpace.cmake @@ -0,0 +1,2 @@ +message(STATUS unquoted(unquoted)) +message(STATUS "quoted"("quoted")) diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake index 8975b25..94963f3 100644 --- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake +++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake @@ -11,6 +11,7 @@ run_cmake(String1) run_cmake(StringNoSpace) run_cmake(Unquoted0) run_cmake(Unquoted1) +run_cmake(ParenNoSpace) run_cmake(UnterminatedCall1) run_cmake(UnterminatedCall2) run_cmake(UnterminatedString) |