[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-863-gd3796df
Ben Boeckel
ben.boeckel at kitware.com
Tue Mar 11 14:46:58 EDT 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 d3796df8de8007102802c3a1355259141625f93c (commit)
via be2d73af5b8f2f42a97aa9b10cafb3dbb0eba2e6 (commit)
via 751c5d714c3071ec7efa9d210b09774f029cdb2d (commit)
via ea5fb2db813c13ff5cfe8eb9449681e258a9a6be (commit)
via 5de8baa71f24b871bb40abbd3bdf3da2020c8622 (commit)
via 5e60e0bbc3847bb785ae0a384fa76b7b053307a0 (commit)
via a3b0411b652963040d7f7f961fb3ddd2cb53e61c (commit)
via aa5400e1408a3a39db467d58e1b51701251f07e2 (commit)
from e23ed2c41f8bda7072f302f67f955cb16e302eba (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=d3796df8de8007102802c3a1355259141625f93c
commit d3796df8de8007102802c3a1355259141625f93c
Merge: e23ed2c be2d73a
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 14:46:57 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 11 14:46:57 2014 -0400
Merge topic 'dev/faster-evis' into next
be2d73af EVIS: update error message
751c5d71 tests: Update trailing '\' expected output
ea5fb2db EVIS: Improve invalid escape character error
5de8baa7 tests: Rename the EscapeCharsDisallowed generated tests
5e60e0bb tests: Rename Bracket3 to Unquoted2
a3b0411b tests: Remove the edits to RunCMake.cmake
aa5400e1 Utilities/Release: Use ${VAR} instead of @VAR@ syntax
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be2d73af5b8f2f42a97aa9b10cafb3dbb0eba2e6
commit be2d73af5b8f2f42a97aa9b10cafb3dbb0eba2e6
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 14:43:11 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 14:43:11 2014 -0400
EVIS: update error message
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f2d3f9b..df4d305 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2947,7 +2947,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
}
else
{
- errorstr += "' (at end of input)";
+ errorstr += "' (at end of input).";
}
error = true;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=751c5d714c3071ec7efa9d210b09774f029cdb2d
commit 751c5d714c3071ec7efa9d210b09774f029cdb2d
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 14:40:00 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 14:40:00 2014 -0400
tests: Update trailing '\' expected output
diff --git a/Tests/RunCMake/Syntax/Escape2-stderr.txt b/Tests/RunCMake/Syntax/Escape2-stderr.txt
index dc46686..cc3bdf0 100644
--- a/Tests/RunCMake/Syntax/Escape2-stderr.txt
+++ b/Tests/RunCMake/Syntax/Escape2-stderr.txt
@@ -7,7 +7,7 @@ CMake Error at Escape2.cmake:4 \(message\):
\\
- Invalid character escape '\\0'.
+ Invalid character escape '\\' \(at end of input\).
Call Stack \(most recent call first\):
Escape2.cmake:7 \(escape\)
CMakeLists.txt:3 \(include\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea5fb2db813c13ff5cfe8eb9449681e258a9a6be
commit ea5fb2db813c13ff5cfe8eb9449681e258a9a6be
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 14:39:44 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 14:39:44 2014 -0400
EVIS: Improve invalid escape character error
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 824a2d8..f2d3f9b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2939,16 +2939,16 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
}
else if (isalnum(nextc) || nextc == '\0')
{
- errorstr += "Invalid character escape \'";
+ errorstr += "Invalid character escape '\\";
if (nextc)
{
errorstr += nextc;
+ errorstr += "'.";
}
else
{
- errorstr += "\\0";
+ errorstr += "' (at end of input)";
}
- errorstr += "\'.";
error = true;
}
else
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5de8baa71f24b871bb40abbd3bdf3da2020c8622
commit 5de8baa71f24b871bb40abbd3bdf3da2020c8622
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 14:39:18 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 14:39:18 2014 -0400
tests: Rename the EscapeCharsDisallowed generated tests
diff --git a/Tests/RunCMake/Syntax/char-result.txt b/Tests/RunCMake/Syntax/EscapeChar-char-result.txt
similarity index 100%
rename from Tests/RunCMake/Syntax/char-result.txt
rename to Tests/RunCMake/Syntax/EscapeChar-char-result.txt
diff --git a/Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in b/Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in
new file mode 100644
index 0000000..d1d908c
--- /dev/null
+++ b/Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in
@@ -0,0 +1,12 @@
+CMake Error at EscapeChar- at char@- at testnum@.cmake:3 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/EscapeChar- at char@- at testnum@.cmake:3
+
+ when parsing string
+
+ -->\\@char@<--
+
+ Invalid character escape '\\@char@'.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/char.cmake.in b/Tests/RunCMake/Syntax/EscapeChar-char.cmake.in
similarity index 100%
rename from Tests/RunCMake/Syntax/char.cmake.in
rename to Tests/RunCMake/Syntax/EscapeChar-char.cmake.in
diff --git a/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake b/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake
index e7cdf0c..eef01a0 100644
--- a/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake
+++ b/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake
@@ -11,16 +11,16 @@ configure_file(
foreach (char IN LISTS disallowed_chars)
configure_file(
- "${RunCMake_SOURCE_DIR}/char.cmake.in"
- "${RunCMake_BINARY_DIR}/${char}-${testnum}.cmake"
+ "${RunCMake_SOURCE_DIR}/EscapeChar-char.cmake.in"
+ "${RunCMake_BINARY_DIR}/EscapeChar-${char}-${testnum}.cmake"
@ONLY)
configure_file(
- "${RunCMake_SOURCE_DIR}/char-stderr.txt.in"
- "${RunCMake_BINARY_DIR}/${char}-${testnum}-stderr.txt"
+ "${RunCMake_SOURCE_DIR}/EscapeChar-char-stderr.txt.in"
+ "${RunCMake_BINARY_DIR}/EscapeChar-${char}-${testnum}-stderr.txt"
@ONLY)
configure_file(
- "${RunCMake_SOURCE_DIR}/char-result.txt"
- "${RunCMake_BINARY_DIR}/${char}-${testnum}-result.txt"
+ "${RunCMake_SOURCE_DIR}/EscapeChar-char-result.txt"
+ "${RunCMake_BINARY_DIR}/EscapeChar-${char}-${testnum}-result.txt"
COPYONLY)
math(EXPR testnum "${testnum} + 1")
@@ -33,7 +33,7 @@ function (run_tests)
set(testnum 0)
foreach (char IN LISTS disallowed_chars)
- run_cmake("${char}-${testnum}")
+ run_cmake("EscapeChar-${char}-${testnum}")
math(EXPR testnum "${testnum} + 1")
endforeach ()
diff --git a/Tests/RunCMake/Syntax/char-stderr.txt.in b/Tests/RunCMake/Syntax/char-stderr.txt.in
deleted file mode 100644
index 11112c9..0000000
--- a/Tests/RunCMake/Syntax/char-stderr.txt.in
+++ /dev/null
@@ -1,12 +0,0 @@
-CMake Error at @char at -@testnum at .cmake:3 \(message\):
- Syntax error in cmake code at
-
- .*/Tests/RunCMake/Syntax/@char at -@testnum at .cmake:3
-
- when parsing string
-
- -->\\@char@<--
-
- Invalid character escape '@char@'.
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e60e0bbc3847bb785ae0a384fa76b7b053307a0
commit 5e60e0bbc3847bb785ae0a384fa76b7b053307a0
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 14:38:43 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 14:38:43 2014 -0400
tests: Rename Bracket3 to Unquoted2
diff --git a/Tests/RunCMake/Syntax/Bracket3-stderr.txt b/Tests/RunCMake/Syntax/Bracket3-stderr.txt
deleted file mode 100644
index 0e474ce..0000000
--- a/Tests/RunCMake/Syntax/Bracket3-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^\[\[BracketArgument1\]\]$
diff --git a/Tests/RunCMake/Syntax/Bracket3.cmake b/Tests/RunCMake/Syntax/Bracket3.cmake
deleted file mode 100644
index 91d535e..0000000
--- a/Tests/RunCMake/Syntax/Bracket3.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_policy(SET CMP0052 NEW)
-
-message(\[[Bracket Argument 1]])
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 11535fd..1145a80 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -28,10 +28,10 @@ run_cmake(StringNoSpace)
run_cmake(OneLetter)
run_cmake(Unquoted0)
run_cmake(Unquoted1)
+run_cmake(Unquoted2)
run_cmake(Bracket0)
run_cmake(Bracket1)
run_cmake(Bracket2)
-run_cmake(Bracket3)
run_cmake(BracketBackslash)
run_cmake(BracketCRLF)
run_cmake(BracketComment0)
diff --git a/Tests/RunCMake/Syntax/Unquoted2-stderr.txt b/Tests/RunCMake/Syntax/Unquoted2-stderr.txt
new file mode 100644
index 0000000..eb8883e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/Unquoted2-stderr.txt
@@ -0,0 +1 @@
+^\[\[UnquotedBracketArgument1\]\]$
diff --git a/Tests/RunCMake/Syntax/Unquoted2.cmake b/Tests/RunCMake/Syntax/Unquoted2.cmake
new file mode 100644
index 0000000..b8fb435
--- /dev/null
+++ b/Tests/RunCMake/Syntax/Unquoted2.cmake
@@ -0,0 +1,3 @@
+cmake_policy(SET CMP0052 NEW)
+
+message(\[[Unquoted Bracket Argument 1]])
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3b0411b652963040d7f7f961fb3ddd2cb53e61c
commit a3b0411b652963040d7f7f961fb3ddd2cb53e61c
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 14:38:13 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 14:38:13 2014 -0400
tests: Remove the edits to RunCMake.cmake
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 5bb5ebb..ed3afc5 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -9,10 +9,8 @@ foreach(arg
endforeach()
function(run_cmake test)
- if (NOT GENERATED_RUNCMAKE_TESTS)
- set(top_src "${RunCMake_SOURCE_DIR}")
- set(top_bin "${RunCMake_BINARY_DIR}")
- endif ()
+ set(top_src "${RunCMake_SOURCE_DIR}")
+ set(top_bin "${RunCMake_BINARY_DIR}")
if(EXISTS ${top_src}/${test}-result.txt)
file(READ ${top_src}/${test}-result.txt expect_result)
string(REGEX REPLACE "\n+$" "" expect_result "${expect_result}")
diff --git a/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake b/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake
index b1728af..e7cdf0c 100644
--- a/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake
+++ b/Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake
@@ -28,8 +28,8 @@ endforeach ()
function (run_tests)
set(GENERATED_RUNCMAKE_TESTS TRUE)
- set(top_src "${RunCMake_BINARY_DIR}")
- set(top_bin "${RunCMake_BINARY_DIR}")
+ # Find the tests in the binary directory.
+ set(RunCMake_SOURCE_DIR "${RunCMake_BINARY_DIR}")
set(testnum 0)
foreach (char IN LISTS disallowed_chars)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa5400e1408a3a39db467d58e1b51701251f07e2
commit aa5400e1408a3a39db467d58e1b51701251f07e2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 26 08:58:45 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 14:30:46 2014 -0400
Utilities/Release: Use ${VAR} instead of @VAR@ syntax
The Utilities/Release/Cygwin/CMakeLists.txt is processed in the project,
not configured, so we should avoid using @-replacement syntax.
diff --git a/Utilities/Release/Cygwin/CMakeLists.txt b/Utilities/Release/Cygwin/CMakeLists.txt
index c59a6fa..73a8220 100644
--- a/Utilities/Release/Cygwin/CMakeLists.txt
+++ b/Utilities/Release/Cygwin/CMakeLists.txt
@@ -14,9 +14,9 @@ message(STATUS "Using curses version: libncurses${MAX}")
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-setup.hint.in"
"${CMake_BINARY_DIR}/setup.hint")
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/README.cygwin.in"
- "${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .README")
+ "${CMake_BINARY_DIR}/Docs/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.README")
install_files(/share/doc/Cygwin FILES
- ${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .README
+ ${CMake_BINARY_DIR}/Docs/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.README
)
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-package.sh.in"
${CPACK_CYGWIN_BUILD_SCRIPT})
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 6 +++---
Tests/RunCMake/RunCMake.cmake | 6 ++----
Tests/RunCMake/Syntax/Bracket3-stderr.txt | 1 -
Tests/RunCMake/Syntax/Bracket3.cmake | 3 ---
Tests/RunCMake/Syntax/Escape2-stderr.txt | 2 +-
.../EscapeChar-char-result.txt} | 0
Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in | 12 ++++++++++++
.../{char.cmake.in => EscapeChar-char.cmake.in} | 0
Tests/RunCMake/Syntax/EscapeCharsDisallowed.cmake | 18 +++++++++---------
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 2 +-
Tests/RunCMake/Syntax/Unquoted2-stderr.txt | 1 +
Tests/RunCMake/Syntax/Unquoted2.cmake | 3 +++
Tests/RunCMake/Syntax/char-result.txt | 1 -
Tests/RunCMake/Syntax/char-stderr.txt.in | 12 ------------
Utilities/Release/Cygwin/CMakeLists.txt | 4 ++--
15 files changed, 34 insertions(+), 37 deletions(-)
delete mode 100644 Tests/RunCMake/Syntax/Bracket3-stderr.txt
delete mode 100644 Tests/RunCMake/Syntax/Bracket3.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/EscapeChar-char-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in
rename Tests/RunCMake/Syntax/{char.cmake.in => EscapeChar-char.cmake.in} (100%)
create mode 100644 Tests/RunCMake/Syntax/Unquoted2-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/Unquoted2.cmake
delete mode 100644 Tests/RunCMake/Syntax/char-result.txt
delete mode 100644 Tests/RunCMake/Syntax/char-stderr.txt.in
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list