[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2262-g3e2180f
Brad King
brad.king at kitware.com
Thu Feb 21 10:01:40 EST 2013
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 3e2180f121e5cdc7376c94a5067731a2e07bab57 (commit)
via cb6607408ed88683a4bc96b8a9c0e1d1bbe37eae (commit)
from 2db860191c177307f4e48b77d4d6569a101124eb (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=3e2180f121e5cdc7376c94a5067731a2e07bab57
commit 3e2180f121e5cdc7376c94a5067731a2e07bab57
Merge: 2db8601 cb66074
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 21 10:01:36 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 21 10:01:36 2013 -0500
Merge topic 'ExternalData-spaces' into next
cb66074 ExternalData: Test content link with a space in its name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb6607408ed88683a4bc96b8a9c0e1d1bbe37eae
commit cb6607408ed88683a4bc96b8a9c0e1d1bbe37eae
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 21 09:59:29 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 21 10:00:55 2013 -0500
ExternalData: Test content link with a space in its name
Extend the Module.ExternalData test to cover a DATA{} reference whose
name contains a space.
diff --git a/Tests/Module/ExternalData/CMakeLists.txt b/Tests/Module/ExternalData/CMakeLists.txt
index 607e9b9..35a759d 100644
--- a/Tests/Module/ExternalData/CMakeLists.txt
+++ b/Tests/Module/ExternalData/CMakeLists.txt
@@ -18,6 +18,7 @@ ExternalData_Add_Test(Data1
NAME Data1Check
COMMAND ${CMAKE_COMMAND}
-D Data=DATA{Data.dat}
+ -D "DataSpace=DATA{Data Space.dat}"
-D SeriesA=DATA{SeriesA.dat,:}
-D SeriesB=DATA{SeriesB.dat,:}
-D SeriesC=DATA{SeriesC.dat,:}
diff --git a/Tests/Module/ExternalData/Data Space.dat.md5 b/Tests/Module/ExternalData/Data Space.dat.md5
new file mode 100644
index 0000000..70e39bd
--- /dev/null
+++ b/Tests/Module/ExternalData/Data Space.dat.md5
@@ -0,0 +1 @@
+8c018830e3efa5caf3c7415028335a57
diff --git a/Tests/Module/ExternalData/Data1Check.cmake b/Tests/Module/ExternalData/Data1Check.cmake
index b99d7ae..54a4156 100644
--- a/Tests/Module/ExternalData/Data1Check.cmake
+++ b/Tests/Module/ExternalData/Data1Check.cmake
@@ -2,6 +2,10 @@ file(STRINGS "${Data}" lines LIMIT_INPUT 1024)
if(NOT "x${lines}" STREQUAL "xInput file already transformed.")
message(SEND_ERROR "Input file:\n ${Data}\ndoes not have expected content, but [[${lines}]]")
endif()
+file(STRINGS "${DataSpace}" lines LIMIT_INPUT 1024)
+if(NOT "x${lines}" STREQUAL "xInput file already transformed.")
+ message(SEND_ERROR "Input file:\n ${DataSpace}\ndoes not have expected content, but [[${lines}]]")
+endif()
set(SeriesAn1 "1\\.dat")
set(SeriesBn1 "_1\\.dat")
set(SeriesCn1 "\\.1\\.dat")
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list