Browse Source

cmGeneratorExpressionNode: add some missing commas

Ben Boeckel 8 years ago
parent
commit
e49c9eec27

+ 1 - 1
Source/cmGeneratorExpressionNode.cxx

@@ -813,7 +813,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
       reportError(
         context, content->GetOriginalExpression(),
         "$<COMPILE_LANGUAGE:...> may only be used to specify include "
-        "directories compile definitions, compile options and to evaluate "
+        "directories, compile definitions, compile options, and to evaluate "
         "components of the file(GENERATE) command.");
       return std::string();
     }

+ 2 - 2
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt

@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_custom_command.cmake:6 \(add_custom_command\
 
     \$<COMPILE_LANGUAGE>
 
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
-  compile definitions, compile options and to evaluate components of the
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
   file\(GENERATE\) command.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

+ 2 - 2
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt

@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_custom_target.cmake:4 \(add_custom_target\):
 
     \$<COMPILE_LANGUAGE>
 
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
-  compile definitions, compile options and to evaluate components of the
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
   file\(GENERATE\) command.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

+ 2 - 2
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt

@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_executable.cmake:4 \(add_executable\):
 
     \$<COMPILE_LANGUAGE>
 
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
-  compile definitions, compile options and to evaluate components of the
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
   file\(GENERATE\) command.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

+ 2 - 2
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt

@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_library.cmake:4 \(add_library\):
 
     \$<COMPILE_LANGUAGE>
 
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
-  compile definitions, compile options and to evaluate components of the
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
   file\(GENERATE\) command.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

+ 2 - 2
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_test-stderr.txt

@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_test.cmake:5 \(add_test\):
 
     \$<COMPILE_LANGUAGE>
 
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
-  compile definitions, compile options and to evaluate components of the
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
   file\(GENERATE\) command.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

+ 2 - 2
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-install-stderr.txt

@@ -3,6 +3,6 @@ CMake Error:
 
     \$<COMPILE_LANGUAGE>
 
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
-  compile definitions, compile options and to evaluate components of the
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
   file\(GENERATE\) command.

+ 2 - 2
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt

@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-target_sources.cmake:5 \(target_sources\):
 
     \$<COMPILE_LANGUAGE>
 
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
-  compile definitions, compile options and to evaluate components of the
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
   file\(GENERATE\) command.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)