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 b085788ea4ac01b2bd53ccc65c60287295610b95 (commit) via 0bcf3e9b5d2a4a156d39ca4092fd496309546239 (commit) via 0561497410a1b07c256adf146bc2e86a7bf7b954 (commit) via 040edebb9f1069f403f8c9bce6f81dbaaf589505 (commit) via 4a74abcec4657ebd3349c1dfad3a8fbf6a9151fe (commit) from 3402e60764e6dbb3626305a5a36a2d0ab4d1881d (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=b085788ea4ac01b2bd53ccc65c60287295610b95 commit b085788ea4ac01b2bd53ccc65c60287295610b95 Merge: 3402e60 0bcf3e9 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu May 1 13:49:21 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu May 1 13:49:21 2014 -0400 Merge topic 'dev/faster-evis' into next 0bcf3e9b tests: Add tests for spaces and tabs in variable names 05614974 EVIS: Output the variable-as-parsed in error message 040edebb CMP0053: Fix some weird wording 4a74abce Help: Update valid variable characters in cmake-language.7 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bcf3e9b5d2a4a156d39ca4092fd496309546239 commit 0bcf3e9b5d2a4a156d39ca4092fd496309546239 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu May 1 13:54:24 2014 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu May 1 13:54:51 2014 -0400 tests: Add tests for spaces and tabs in variable names diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt new file mode 100644 index 0000000..df67d37 --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at CMP0053-NameWithEscapedSpaces.cmake:2 \(message\): + message called with incorrect number of arguments +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake new file mode 100644 index 0000000..805b2ca --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message(${var\ with\ escaped\ space}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake new file mode 100644 index 0000000..58d8e8f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message("${var\ with\ escaped\ space}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt new file mode 100644 index 0000000..059044f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at CMP0053-NameWithEscapedTabs.cmake:2 \(message\): + message called with incorrect number of arguments +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake new file mode 100644 index 0000000..214ab5d --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message(${var\ with\ escaped\ tab}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake new file mode 100644 index 0000000..aa5123f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message("${var\ with\ escaped\ tab}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt new file mode 100644 index 0000000..95e8684 --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at CMP0053-NameWithSpaces.cmake:2 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake:2 + + when parsing string + + \${var + + There is an unterminated variable reference. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake new file mode 100644 index 0000000..dae7d25 --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message(${var with space}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt new file mode 100644 index 0000000..c4f3cfe --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at CMP0053-NameWithSpacesQuoted.cmake:2 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake:2 + + when parsing string + + \${var with space} + + Invalid character \(' '\) in a variable name: 'var' +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake new file mode 100644 index 0000000..e252cff --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message("${var with space}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt new file mode 100644 index 0000000..b1678b3 --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at CMP0053-NameWithTabs.cmake:2 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake:2 + + when parsing string + + \${var + + There is an unterminated variable reference. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake new file mode 100644 index 0000000..45e3045 --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message(${var with tab}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt new file mode 100644 index 0000000..78adb5e --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at CMP0053-NameWithTabsQuoted.cmake:2 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake:2 + + when parsing string + + \${var with tab} + + Invalid character \(' '\) in a variable name: 'var' +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake new file mode 100644 index 0000000..498675f --- /dev/null +++ b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0053 NEW) +message("${var with tab}") diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpaces-result.txt b/Tests/RunCMake/Syntax/NameWithEscapedSpaces-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedSpaces-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt new file mode 100644 index 0000000..fa16a8a --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithEscapedSpaces.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithEscapedSpaces.cmake:1 + + when parsing string + + \${var\\ with\\ escaped\\ space} + + syntax error, unexpected cal_SYMBOL, expecting } \(7\) +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpaces.cmake b/Tests/RunCMake/Syntax/NameWithEscapedSpaces.cmake new file mode 100644 index 0000000..6cb8401 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedSpaces.cmake @@ -0,0 +1 @@ +message(${var\ with\ escaped\ space}) diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt new file mode 100644 index 0000000..07cbf24 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithEscapedSpacesQuoted.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted.cmake:1 + + when parsing string + + \${var\\ with\\ escaped\\ space} + + syntax error, unexpected cal_SYMBOL, expecting } \(7\) +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted.cmake b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted.cmake new file mode 100644 index 0000000..2bd4bfd --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted.cmake @@ -0,0 +1 @@ +message("${var\ with\ escaped\ space}") diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabs-result.txt b/Tests/RunCMake/Syntax/NameWithEscapedTabs-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedTabs-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt new file mode 100644 index 0000000..d7fc38a --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithEscapedTabs.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithEscapedTabs.cmake:1 + + when parsing string + + \${var\\ with\\ escaped\\ tab} + + Invalid escape sequence \\.? +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabs.cmake b/Tests/RunCMake/Syntax/NameWithEscapedTabs.cmake new file mode 100644 index 0000000..c6faa7a --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedTabs.cmake @@ -0,0 +1 @@ +message(${var\ with\ escaped\ tab}) diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt new file mode 100644 index 0000000..915dbaa --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithEscapedTabsQuoted.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted.cmake:1 + + when parsing string + + \${var\\ with\\ escaped\\ tab} + + Invalid escape sequence \\.? +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted.cmake b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted.cmake new file mode 100644 index 0000000..d9be763 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted.cmake @@ -0,0 +1 @@ +message("${var\ with\ escaped\ tab}") diff --git a/Tests/RunCMake/Syntax/NameWithSpaces-result.txt b/Tests/RunCMake/Syntax/NameWithSpaces-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithSpaces-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt b/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt new file mode 100644 index 0000000..04bc226 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithSpaces.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithSpaces.cmake:1 + + when parsing string + + \${var + + syntax error, unexpected \$end, expecting } \(5\) +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithSpaces.cmake b/Tests/RunCMake/Syntax/NameWithSpaces.cmake new file mode 100644 index 0000000..01febe9 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithSpaces.cmake @@ -0,0 +1 @@ +message(${var with space}) diff --git a/Tests/RunCMake/Syntax/NameWithSpacesQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithSpacesQuoted-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithSpacesQuoted-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt new file mode 100644 index 0000000..66cf9a2 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithSpacesQuoted.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithSpacesQuoted.cmake:1 + + when parsing string + + \${var with space} + + syntax error, unexpected cal_SYMBOL, expecting } \(17\) +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithSpacesQuoted.cmake b/Tests/RunCMake/Syntax/NameWithSpacesQuoted.cmake new file mode 100644 index 0000000..3fba53f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithSpacesQuoted.cmake @@ -0,0 +1 @@ +message("${var with space}") diff --git a/Tests/RunCMake/Syntax/NameWithTabs-result.txt b/Tests/RunCMake/Syntax/NameWithTabs-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithTabs-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt b/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt new file mode 100644 index 0000000..e888096 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithTabs.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithTabs.cmake:1 + + when parsing string + + \${var + + syntax error, unexpected \$end, expecting } \(5\) +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithTabs.cmake b/Tests/RunCMake/Syntax/NameWithTabs.cmake new file mode 100644 index 0000000..c3b1bea --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithTabs.cmake @@ -0,0 +1 @@ +message(${var with tab}) diff --git a/Tests/RunCMake/Syntax/NameWithTabsQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithTabsQuoted-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithTabsQuoted-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt new file mode 100644 index 0000000..b020074 --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at NameWithTabsQuoted.cmake:1 \(message\): + Syntax error in cmake code at + + .*/Tests/RunCMake/Syntax/NameWithTabsQuoted.cmake:1 + + when parsing string + + \${var with tab} + + syntax error, unexpected cal_SYMBOL, expecting } \(15\) +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithTabsQuoted.cmake b/Tests/RunCMake/Syntax/NameWithTabsQuoted.cmake new file mode 100644 index 0000000..8ddb85d --- /dev/null +++ b/Tests/RunCMake/Syntax/NameWithTabsQuoted.cmake @@ -0,0 +1 @@ +message("${var with tab}") diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake index fe12a0f..c53549f 100644 --- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake +++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake @@ -78,3 +78,21 @@ run_cmake(AtWithVariableFile) run_cmake(AtWithVariableAtOnlyFile) run_cmake(ParenInENV) run_cmake(ParenInQuotedENV) + +# Variable name tests +run_cmake(NameWithSpaces) +run_cmake(NameWithTabs) +run_cmake(NameWithEscapedSpaces) +run_cmake(NameWithEscapedTabs) +run_cmake(NameWithSpacesQuoted) +run_cmake(NameWithTabsQuoted) +run_cmake(NameWithEscapedSpacesQuoted) +run_cmake(NameWithEscapedTabsQuoted) +run_cmake(CMP0053-NameWithSpaces) +run_cmake(CMP0053-NameWithTabs) +run_cmake(CMP0053-NameWithEscapedSpaces) +run_cmake(CMP0053-NameWithEscapedTabs) +run_cmake(CMP0053-NameWithSpacesQuoted) +run_cmake(CMP0053-NameWithTabsQuoted) +run_cmake(CMP0053-NameWithEscapedSpacesQuoted) +run_cmake(CMP0053-NameWithEscapedTabsQuoted) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0561497410a1b07c256adf146bc2e86a7bf7b954 commit 0561497410a1b07c256adf146bc2e86a7bf7b954 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu May 1 13:50:22 2014 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu May 1 13:54:51 2014 -0400 EVIS: Output the variable-as-parsed in error message diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8f889b6..cc52c24 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3073,7 +3073,9 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew( { errorstr += "Invalid character (\'"; errorstr += inc; - errorstr += "\') in a variable name: " + openstack.top().lookup; + openstack.top().lookup.append(last, in - last); + errorstr += "\') in a variable name: " + "'" + openstack.top().lookup + "'"; mtype = cmake::FATAL_ERROR; error = true; } diff --git a/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt b/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt index 2f117cd..0a6b60f 100644 --- a/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt +++ b/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt @@ -7,6 +7,6 @@ CMake Error at ParenInVarName0.cmake:4 \(message\): -->\${e\(x\)}<-- - Invalid character \('\('\) in a variable name: + Invalid character \('\('\) in a variable name: 'e' Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=040edebb9f1069f403f8c9bce6f81dbaaf589505 commit 040edebb9f1069f403f8c9bce6f81dbaaf589505 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu May 1 13:49:45 2014 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu May 1 13:49:45 2014 -0400 CMP0053: Fix some weird wording diff --git a/Help/policy/CMP0053.rst b/Help/policy/CMP0053.rst index ba7ebd3..542de63 100644 --- a/Help/policy/CMP0053.rst +++ b/Help/policy/CMP0053.rst @@ -25,8 +25,8 @@ cleaned up to simplify the behavior. Specifically: set(varname "otherwise & disallowed $ characters") message("${${varname}}") -* The setting of policy :policy:`CMP0010` is not considered - so bad variable reference syntax is always an error. +* The setting of policy :policy:`CMP0010` is not considered, + so improper variable reference syntax is always an error. The ``OLD`` behavior for this policy is to honor the legacy behavior for variable references and escape sequences. The ``NEW`` behavior is to http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a74abcec4657ebd3349c1dfad3a8fbf6a9151fe commit 4a74abcec4657ebd3349c1dfad3a8fbf6a9151fe Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu May 1 13:49:24 2014 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu May 1 13:49:24 2014 -0400 Help: Update valid variable characters in cmake-language.7 diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst index 5bbe16e..e8d2670 100644 --- a/Help/manual/cmake-language.7.rst +++ b/Help/manual/cmake-language.7.rst @@ -409,9 +409,14 @@ interpret the strings as values of other types. The :command:`set` and :command:`unset` commands explicitly set or unset a variable, but other commands have semantics that modify variables as well. -Variable names are case-sensitive and may consist of almost -any text, but we recommend sticking to names consisting only -of alphanumeric characters plus ``_`` and ``-``. +Variable names are case-sensitive and may consist of alphanumeric characters +plus the characters ``/_.+-``. If other characters are required (e.g., to +support literal variables no longer accepted by :policy:`CMP0053`), the +following may be used: + +.. code-block:: cmake + + set(name "old_variable_name@") # Use ${${name}} Variables have dynamic scope. Each variable "set" or "unset" creates a binding in the current scope: ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-language.7.rst | 11 ++++++++--- Help/policy/CMP0053.rst | 4 ++-- Source/cmMakefile.cxx | 4 +++- .../CMP0053-NameWithEscapedSpaces-result.txt} | 0 .../Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt | 4 ++++ .../Syntax/CMP0053-NameWithEscapedSpaces.cmake | 2 ++ .../Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake | 2 ++ .../CMP0053-NameWithEscapedTabs-result.txt} | 0 .../Syntax/CMP0053-NameWithEscapedTabs-stderr.txt | 4 ++++ .../Syntax/CMP0053-NameWithEscapedTabs.cmake | 2 ++ .../Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake | 2 ++ .../CMP0053-NameWithSpaces-result.txt} | 0 .../Syntax/CMP0053-NameWithSpaces-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake | 2 ++ .../CMP0053-NameWithSpacesQuoted-result.txt} | 0 .../Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt | 12 ++++++++++++ .../Syntax/CMP0053-NameWithSpacesQuoted.cmake | 2 ++ .../CMP0053-NameWithTabs-result.txt} | 0 .../RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake | 2 ++ .../CMP0053-NameWithTabsQuoted-result.txt} | 0 .../Syntax/CMP0053-NameWithTabsQuoted-stderr.txt | 12 ++++++++++++ .../RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake | 2 ++ .../NameWithEscapedSpaces-result.txt} | 0 .../RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/NameWithEscapedSpaces.cmake | 1 + .../NameWithEscapedSpacesQuoted-result.txt} | 0 .../Syntax/NameWithEscapedSpacesQuoted-stderr.txt | 12 ++++++++++++ .../Syntax/NameWithEscapedSpacesQuoted.cmake | 1 + .../NameWithEscapedTabs-result.txt} | 0 Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/NameWithEscapedTabs.cmake | 1 + .../NameWithEscapedTabsQuoted-result.txt} | 0 .../Syntax/NameWithEscapedTabsQuoted-stderr.txt | 12 ++++++++++++ .../RunCMake/Syntax/NameWithEscapedTabsQuoted.cmake | 1 + .../NameWithSpaces-result.txt} | 0 Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/NameWithSpaces.cmake | 1 + .../NameWithSpacesQuoted-result.txt} | 0 .../RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/NameWithSpacesQuoted.cmake | 1 + .../NameWithTabs-result.txt} | 0 Tests/RunCMake/Syntax/NameWithTabs-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/NameWithTabs.cmake | 1 + .../NameWithTabsQuoted-result.txt} | 0 Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt | 12 ++++++++++++ Tests/RunCMake/Syntax/NameWithTabsQuoted.cmake | 1 + Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt | 2 +- Tests/RunCMake/Syntax/RunCMakeTest.cmake | 18 ++++++++++++++++++ 49 files changed, 208 insertions(+), 7 deletions(-) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithEscapedSpaces-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithEscapedTabs-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithSpaces-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithSpacesQuoted-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithTabs-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithTabsQuoted-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithEscapedSpaces-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedSpaces.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithEscapedSpacesQuoted-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithEscapedTabs-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedTabs.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithEscapedTabsQuoted-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithSpaces-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithSpaces.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithSpacesQuoted-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithSpacesQuoted.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithTabs-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithTabs-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithTabs.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithTabsQuoted-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt create mode 100644 Tests/RunCMake/Syntax/NameWithTabsQuoted.cmake hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits