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 85c864253322b4d79d854e960239ae2a93705242 (commit)
via ae92a9485f3168a21882b76469e878f7abc65fa6 (commit)
via 075742e2af118e411abe6645b5333547f4150fd3 (commit)
via bc29b9310b92f6ac4fd8456dbc00349f3632a214 (commit)
from 3c64f7fe7a468d5b497df9694f6c00a6c68bc189 (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=85c864253322b4d79d854e960239ae2a93705242
commit 85c864253322b4d79d854e960239ae2a93705242
Merge: 3c64f7f ae92a94
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:13:24 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Feb 12 18:13:24 2014 -0500
Merge topic 'variable-expansion-tests' into next
ae92a948 tests: Test @ expansion with variable references in it
075742e2 tests: Test string(CONFIGURE) expansion with escaped quotes
bc29b931 tests: Add variable expansion tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae92a9485f3168a21882b76469e878f7abc65fa6
commit ae92a9485f3168a21882b76469e878f7abc65fa6
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:12:26 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Feb 12 18:12:26 2014 -0500
tests: Test @ expansion with variable references in it
Yet another difference between string(CONFIGURE) and configure_file().
@ONLY makes sense, but string(CONFIGURE) will dereference the variable
as well while configure_file will not.
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
new file mode 100644
index 0000000..5dcd4d7
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
@@ -0,0 +1 @@
+-->wrong<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
new file mode 100644
index 0000000..7d28af1
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
@@ -0,0 +1,6 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+string(CONFIGURE "${ref}" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
new file mode 100644
index 0000000..cbd1be4
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
@@ -0,0 +1 @@
+-->\${right}<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
new file mode 100644
index 0000000..9b29a9b
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
@@ -0,0 +1,6 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+string(CONFIGURE "${ref}" output @ONLY)
+message("-->${output}<--")
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
new file mode 100644
index 0000000..4bb4ed3
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
@@ -0,0 +1,2 @@
+-->\${right}
+<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
new file mode 100644
index 0000000..4160be5
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
@@ -0,0 +1,10 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/atfile.txt.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt"
+ @ONLY)
+file(READ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
new file mode 100644
index 0000000..4bb4ed3
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
@@ -0,0 +1,2 @@
+-->\${right}
+<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
new file mode 100644
index 0000000..dc93e1d
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
@@ -0,0 +1,9 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/atfile.txt.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt")
+file(READ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
index aa6e0ca..832585e 100644
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -3,3 +3,7 @@ include(RunCMake)
run_cmake(ExpandInAt)
run_cmake(EscapedAt)
run_cmake(EscapeQuotes)
+run_cmake(AtWithVariable)
+run_cmake(AtWithVariableAtOnly)
+run_cmake(AtWithVariableFile)
+run_cmake(AtWithVariableAtOnlyFile)
diff --git a/Tests/RunCMake/variable_expansion/atfile.txt.in
b/Tests/RunCMake/variable_expansion/atfile.txt.in
new file mode 100644
index 0000000..701b7ec
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/atfile.txt.in
@@ -0,0 +1 @@
+@var@
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=075742e2af118e411abe6645b5333547f4150fd3
commit 075742e2af118e411abe6645b5333547f4150fd3
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:10:57 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Feb 12 18:10:57 2014 -0500
tests: Test string(CONFIGURE) expansion with escaped quotes
*sigh* Not at all intuitive. Without @ONLY, quotes get escaped, but lose
their escape when passing through the lex/yacc parser.
diff --git a/Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
b/Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
new file mode 100644
index 0000000..077272d
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
@@ -0,0 +1 @@
+-->"<--
diff --git a/Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
b/Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
new file mode 100644
index 0000000..46d2b6f
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
@@ -0,0 +1,9 @@
+set(var "\"")
+set(ref "@var@")
+set(rref "\${var}")
+
+string(CONFIGURE "${ref}" output ESCAPE_QUOTES)
+message("-->${output}<--")
+
+string(CONFIGURE "${rref}" output ESCAPE_QUOTES)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
index 4bc28e0..aa6e0ca 100644
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -2,3 +2,4 @@ include(RunCMake)
run_cmake(ExpandInAt)
run_cmake(EscapedAt)
+run_cmake(EscapeQuotes)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc29b9310b92f6ac4fd8456dbc00349f3632a214
commit bc29b9310b92f6ac4fd8456dbc00349f3632a214
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Fri Feb 7 17:53:31 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Fri Feb 7 17:53:31 2014 -0500
tests: Add variable expansion tests
There are some corner cases in variable expansion which would be nice to
capture before going and rewriting the variable expansion code.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c29b736..5bdfba8 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -115,3 +115,5 @@ add_RunCMake_test(CheckModules)
add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
+
+add_RunCMake_test(variable_expansion)
diff --git a/Tests/RunCMake/variable_expansion/CMakeLists.txt
b/Tests/RunCMake/variable_expansion/CMakeLists.txt
new file mode 100644
index 0000000..12cd3c7
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
b/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
new file mode 100644
index 0000000..a51c0d3
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
@@ -0,0 +1 @@
+-->\\n<--
diff --git a/Tests/RunCMake/variable_expansion/EscapedAt.cmake
b/Tests/RunCMake/variable_expansion/EscapedAt.cmake
new file mode 100644
index 0000000..1ced620
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapedAt.cmake
@@ -0,0 +1,5 @@
+set(var "n")
+set(ref "\\@var@")
+
+string(CONFIGURE "${ref}" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
b/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
new file mode 100644
index 0000000..5da8b60
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
@@ -0,0 +1 @@
+-->@foo@<--
diff --git a/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
b/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
new file mode 100644
index 0000000..98f0277
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
@@ -0,0 +1,6 @@
+set("\${varname}" bar)
+set(var foo)
+set(ref "@\${var}@")
+
+string(CONFIGURE "${ref}" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
new file mode 100644
index 0000000..4bc28e0
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -0,0 +1,4 @@
+include(RunCMake)
+
+run_cmake(ExpandInAt)
+run_cmake(EscapedAt)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 2 ++
Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt | 1 +
Tests/RunCMake/variable_expansion/AtWithVariable.cmake | 6 ++++++
.../variable_expansion/AtWithVariableAtOnly-stderr.txt | 1 +
Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake | 6 ++++++
.../variable_expansion/AtWithVariableAtOnlyFile-stderr.txt | 2 ++
.../variable_expansion/AtWithVariableAtOnlyFile.cmake | 10 ++++++++++
.../variable_expansion/AtWithVariableFile-stderr.txt | 2 ++
Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake | 9 +++++++++
.../RunCMake/{CMP0004 => variable_expansion}/CMakeLists.txt | 0
Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt | 1 +
Tests/RunCMake/variable_expansion/EscapeQuotes.cmake | 9 +++++++++
Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt | 1 +
Tests/RunCMake/variable_expansion/EscapedAt.cmake | 5 +++++
Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt | 1 +
Tests/RunCMake/variable_expansion/ExpandInAt.cmake | 6 ++++++
Tests/RunCMake/variable_expansion/RunCMakeTest.cmake | 9 +++++++++
Tests/RunCMake/variable_expansion/atfile.txt.in | 1 +
18 files changed, 72 insertions(+)
create mode 100644 Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
create mode 100644 Tests/RunCMake/variable_expansion/AtWithVariable.cmake
create mode 100644
Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
create mode 100644 Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
create mode 100644
Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
create mode 100644
Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
create mode 100644
Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
create mode 100644 Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
copy Tests/RunCMake/{CMP0004 => variable_expansion}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
create mode 100644 Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
create mode 100644 Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
create mode 100644 Tests/RunCMake/variable_expansion/EscapedAt.cmake
create mode 100644 Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
create mode 100644 Tests/RunCMake/variable_expansion/ExpandInAt.cmake
create mode 100644 Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/variable_expansion/atfile.txt.in
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
