[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3894-g93c0993

[Brad King]

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  93c0993e237a73569d556f558b93ff93bcfcc5fd (commit)
       via  9040ec91173824b27dd946d7bd36cc9c07268d74 (commit)
      from  a842a2151e972791e5072984be642fe5acdb8170 (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=93c0993e237a73569d556f558b93ff93bcfcc5fd
commit 93c0993e237a73569d556f558b93ff93bcfcc5fd
Merge: a842a21 9040ec9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 15 09:06:13 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 15 09:06:13 2013 -0400

    Merge topic 'cmake-syntax' into next
    
    9040ec9 Do not warn about left paren not separated by a space


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9040ec91173824b27dd946d7bd36cc9c07268d74
commit 9040ec91173824b27dd946d7bd36cc9c07268d74
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 15 08:22:15 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 15 09:00:34 2013 -0400

    Do not warn about left paren not separated by a space
    
    Since commit 58e52416 (Warn about arguments not separated by whitespace,
    2013-02-16) we warn about arguments not separated by spaces.  Loosen the
    warning to not complain about left parens not separated by spaces from
    the preceding token.  This is common in code like "if(NOT(X))".
    
    Teach the RunCMake.Syntax test to cover cases of left parens not
    separated by spaces and check that no warning appears.

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)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmListFileCache.cxx                         |    2 +-
 .../ParenNoSpace-stderr.txt}                       |    0
 Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt      |    2 ++
 Tests/RunCMake/Syntax/ParenNoSpace.cmake           |    2 ++
 Tests/RunCMake/Syntax/RunCMakeTest.cmake           |    1 +
 5 files changed, 6 insertions(+), 1 deletions(-)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt => Syntax/ParenNoSpace-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt
 create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace.cmake


hooks/post-receive
-- 
CMake