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 961e6eab56fed5dbd163dddbc23f97b3b549b104 (commit)
via 1e4f09aafb47cf7041d9a5f5bc15ee901d05aa32 (commit)
from ef1fbc9a1adfe2f92766fb38516ad868a2fe0e37 (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=961e6eab56fed5dbd163dddbc23f97b3b549b104
commit 961e6eab56fed5dbd163dddbc23f97b3b549b104
Merge: ef1fbc9 1e4f09a
Author: Brad King <[email protected]>
AuthorDate: Wed Feb 12 15:24:26 2014 -0500
Commit: Brad King <[email protected]>
CommitDate: Wed Feb 12 15:24:26 2014 -0500
Merge branch 'revert/custom-parsers' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e4f09aafb47cf7041d9a5f5bc15ee901d05aa32
commit 1e4f09aafb47cf7041d9a5f5bc15ee901d05aa32
Author: Brad King <[email protected]>
AuthorDate: Wed Feb 12 15:22:58 2014 -0500
Commit: Brad King <[email protected]>
CommitDate: Wed Feb 12 15:22:58 2014 -0500
Revert custom-parsers more completely
diff --git a/Help/release/dev/custom-parsers.rst
b/Help/release/dev/custom-parsers.rst
deleted file mode 100644
index eef01fb..0000000
--- a/Help/release/dev/custom-parsers.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-custom-parsers
---------------
-
-* The :manual:`cmake-language(7)` internal implementation of variable
- evaluation has been optimized and shows non-trivial speedup on large
- projects.
diff --git a/Source/cmCommandArgumentLexer.cxx
b/Source/cmCommandArgumentLexer.cxx
index f9a287b..e62e53e 100644
--- a/Source/cmCommandArgumentLexer.cxx
+++ b/Source/cmCommandArgumentLexer.cxx
@@ -2074,3 +2074,4 @@ void cmCommandArgument_SetupEscapes(yyscan_t yyscanner,
bool noEscapes)
BEGIN(ESCAPES);
}
}
+
diff --git a/Source/cmCommandArgumentParser.cxx
b/Source/cmCommandArgumentParser.cxx
index 0fd8f9f..c5146c5 100644
--- a/Source/cmCommandArgumentParser.cxx
+++ b/Source/cmCommandArgumentParser.cxx
@@ -1831,3 +1831,5 @@ void cmCommandArgumentError(yyscan_t yyscanner, const
char* message)
{
yyGetParser->Error(message);
}
+
+
diff --git a/Source/cmCommandArgumentParser.y b/Source/cmCommandArgumentParser.y
index 86022a7..48f5c8e 100644
--- a/Source/cmCommandArgumentParser.y
+++ b/Source/cmCommandArgumentParser.y
@@ -243,3 +243,4 @@ void cmCommandArgumentError(yyscan_t yyscanner, const char*
message)
{
yyGetParser->Error(message);
}
+
diff --git a/Source/cmCommandArgumentParserHelper.h
b/Source/cmCommandArgumentParserHelper.h
index f1a9f11..f8c672f 100644
--- a/Source/cmCommandArgumentParserHelper.h
+++ b/Source/cmCommandArgumentParserHelper.h
@@ -106,3 +106,5 @@ private:
};
#endif
+
+
diff --git a/Source/cmCommandArgumentParserTokens.h
b/Source/cmCommandArgumentParserTokens.h
index 5c81201..7fb58e2 100644
--- a/Source/cmCommandArgumentParserTokens.h
+++ b/Source/cmCommandArgumentParserTokens.h
@@ -87,3 +87,6 @@ typedef int YYSTYPE;
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif
+
+
+
diff --git a/Source/cmCommandArgumentsHelper.cxx
b/Source/cmCommandArgumentsHelper.cxx
index 5aa1b80..1d5fc07 100644
--- a/Source/cmCommandArgumentsHelper.cxx
+++ b/Source/cmCommandArgumentsHelper.cxx
@@ -304,3 +304,4 @@ void
cmCommandArgumentsHelper::AddArgument(cmCommandArgument* arg)
{
this->Arguments.push_back(arg);
}
+
diff --git a/Tests/RunCMake/variable_expansion/CMakeLists.txt
b/Tests/RunCMake/variable_expansion/CMakeLists.txt
deleted file mode 100644
index 12cd3c7..0000000
--- a/Tests/RunCMake/variable_expansion/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a51c0d3..0000000
--- a/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
--->\\n<--
diff --git a/Tests/RunCMake/variable_expansion/EscapedAt.cmake
b/Tests/RunCMake/variable_expansion/EscapedAt.cmake
deleted file mode 100644
index 1ced620..0000000
--- a/Tests/RunCMake/variable_expansion/EscapedAt.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 5da8b60..0000000
--- a/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
--->@foo@<--
diff --git a/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
b/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
deleted file mode 100644
index 98f0277..0000000
--- a/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 4bc28e0..0000000
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-include(RunCMake)
-
-run_cmake(ExpandInAt)
-run_cmake(EscapedAt)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/custom-parsers.rst | 6 ------
Source/cmCommandArgumentLexer.cxx | 1 +
Source/cmCommandArgumentParser.cxx | 2 ++
Source/cmCommandArgumentParser.y | 1 +
Source/cmCommandArgumentParserHelper.h | 2 ++
Source/cmCommandArgumentParserTokens.h | 3 +++
Source/cmCommandArgumentsHelper.cxx | 1 +
Tests/RunCMake/variable_expansion/CMakeLists.txt | 3 ---
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 | 4 ----
13 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 Help/release/dev/custom-parsers.rst
delete mode 100644 Tests/RunCMake/variable_expansion/CMakeLists.txt
delete mode 100644 Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
delete mode 100644 Tests/RunCMake/variable_expansion/EscapedAt.cmake
delete mode 100644 Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
delete mode 100644 Tests/RunCMake/variable_expansion/ExpandInAt.cmake
delete mode 100644 Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
