[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1656-g466bdaa
Ben Boeckel
ben.boeckel at kitware.com
Sun Feb 23 13:51:19 EST 2014
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 466bdaac5d10fb3ba2a731608d07a326378b67d1 (commit)
via f27df9f70d74bacb9ad1be783e51d2829c897489 (commit)
via f0815f03e09fe841844d9e971bb328086a8912c2 (commit)
via cec5c26afa97bbcb6abaf8a3d4cef2f6d87e1842 (commit)
from 86fc5fe20405eae1e91abe4f7cc939846c6786a6 (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=466bdaac5d10fb3ba2a731608d07a326378b67d1
commit 466bdaac5d10fb3ba2a731608d07a326378b67d1
Merge: 86fc5fe f27df9f
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Sun Feb 23 13:51:18 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 23 13:51:18 2014 -0500
Merge topic 'dev/faster-evis' into next
f27df9f7 Remove ENV tests for CMP0052
f0815f03 Add in CMP0052 to the doctree
cec5c26a policy: Update docs
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f27df9f70d74bacb9ad1be783e51d2829c897489
commit f27df9f70d74bacb9ad1be783e51d2829c897489
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Sun Feb 23 13:50:44 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Sun Feb 23 13:50:44 2014 -0500
Remove ENV tests for CMP0052
Parentheses are now allowed in variable names.
diff --git a/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-result.txt b/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-stderr.txt
deleted file mode 100644
index bc799c7..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-stderr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-CMake Error at CMP0052-ENV-NEW.cmake:4 \(message\):
- Syntax error in cmake code at
-
- .*/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW.cmake:4
-
- when parsing string
-
- -->\$ENV{e\(x\)}<--
-
- Invalid character \('\('\) in a variable name:
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW.cmake b/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW.cmake
deleted file mode 100644
index bbea56c..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-ENV-NEW.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_policy(SET CMP0052 NEW)
-
-set("ENV{e(x)}" value)
-message("-->$ENV{e(x)}<--")
diff --git a/Tests/RunCMake/CMP0052/CMP0052-ENV-OLD-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-ENV-OLD-stderr.txt
deleted file mode 100644
index 7020c7e..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-ENV-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
--->value<--
diff --git a/Tests/RunCMake/CMP0052/CMP0052-ENV-OLD.cmake b/Tests/RunCMake/CMP0052/CMP0052-ENV-OLD.cmake
deleted file mode 100644
index dbb5451..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-ENV-OLD.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_policy(SET CMP0052 OLD)
-
-set("ENV{e(x)}" value)
-message("-->$ENV{e(x)}<--")
diff --git a/Tests/RunCMake/CMP0052/CMP0052-ENV-WARN-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-ENV-WARN-stderr.txt
deleted file mode 100644
index ff255c3..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-ENV-WARN-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CMake Warning \(dev\) at CMP0052-ENV-WARN.cmake:2 \(message\):
- Policy CMP0052 is not set: Use the new variable expansion rules. Run
- "cmake --help-policy CMP0052" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
-This warning is for project developers. Use -Wno-dev to suppress it.
-
--->value<--
diff --git a/Tests/RunCMake/CMP0052/CMP0052-ENV-WARN.cmake b/Tests/RunCMake/CMP0052/CMP0052-ENV-WARN.cmake
deleted file mode 100644
index 6333717..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-ENV-WARN.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set("ENV{e(x)}" value)
-message("-->$ENV{e(x)}<--")
diff --git a/Tests/RunCMake/CMP0052/RunCMakeTest.cmake b/Tests/RunCMake/CMP0052/RunCMakeTest.cmake
index 15719d9..8e82458 100644
--- a/Tests/RunCMake/CMP0052/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0052/RunCMakeTest.cmake
@@ -3,7 +3,3 @@ include(RunCMake)
run_cmake(CMP0052-At-OLD)
run_cmake(CMP0052-At-NEW)
run_cmake(CMP0052-At-WARN)
-
-run_cmake(CMP0052-ENV-OLD)
-run_cmake(CMP0052-ENV-NEW)
-run_cmake(CMP0052-ENV-WARN)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0815f03e09fe841844d9e971bb328086a8912c2
commit f0815f03e09fe841844d9e971bb328086a8912c2
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Sun Feb 23 13:42:18 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Sun Feb 23 13:42:18 2014 -0500
Add in CMP0052 to the doctree
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 8650a58..0043bd2 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -102,3 +102,4 @@ All Policies
/policy/CMP0048
/policy/CMP0049
/policy/CMP0050
+ /policy/CMP0052
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cec5c26afa97bbcb6abaf8a3d4cef2f6d87e1842
commit cec5c26afa97bbcb6abaf8a3d4cef2f6d87e1842
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Feb 21 21:50:29 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Feb 21 21:50:29 2014 -0500
policy: Update docs
diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst
index 83f58c4..c4cfab4 100644
--- a/Help/policy/CMP0052.rst
+++ b/Help/policy/CMP0052.rst
@@ -8,11 +8,11 @@ which offered some behavior no longer allowed by the new parser. Specifically,
'@' expansion is no longer performed in files not configured using
:command:`configure_file` or the CONFIGURE signature of :command:`string` and
literal variable names are restricted to alphanumerics and the characters
-"./-+". If variables with other characters are required, use
+"./-+()". If variables with other characters are required, use
.. code-block:: cmake
- set(varname "parens()")
+ set(varname "disallowschars&")
message("${${varname}}")
The OLD behavior for this policy is to use the old variable expansion parser.
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-policies.7.rst | 1 +
Help/policy/CMP0052.rst | 4 ++--
Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-result.txt | 1 -
Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-stderr.txt | 12 ------------
Tests/RunCMake/CMP0052/CMP0052-ENV-NEW.cmake | 4 ----
Tests/RunCMake/CMP0052/CMP0052-ENV-OLD-stderr.txt | 1 -
Tests/RunCMake/CMP0052/CMP0052-ENV-OLD.cmake | 4 ----
Tests/RunCMake/CMP0052/CMP0052-ENV-WARN-stderr.txt | 9 ---------
Tests/RunCMake/CMP0052/CMP0052-ENV-WARN.cmake | 2 --
Tests/RunCMake/CMP0052/RunCMakeTest.cmake | 4 ----
10 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-result.txt
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-ENV-NEW-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-ENV-NEW.cmake
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-ENV-OLD-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-ENV-OLD.cmake
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-ENV-WARN-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-ENV-WARN.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list