Răsfoiți Sursa

Merge topic 'cmake-syntax'

9040ec9 Do not warn about left paren not separated by a space
Brad King 12 ani în urmă
părinte
comite
8da09f6ee1

+ 1 - 1
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)
       {

+ 1 - 0
Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt

@@ -0,0 +1 @@
+^$

+ 2 - 0
Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt

@@ -0,0 +1,2 @@
+-- unquoted\(unquoted\)
+-- quoted\(quoted\)

+ 2 - 0
Tests/RunCMake/Syntax/ParenNoSpace.cmake

@@ -0,0 +1,2 @@
+message(STATUS unquoted(unquoted))
+message(STATUS "quoted"("quoted"))

+ 1 - 0
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)