[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2277-g6098881

[Brad King]

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  6098881a8721df0a29dbafbc4ca9c55ccc692979 (commit)
       via  c5731d1b664a4aa329d4804b547495fe78d534cd (commit)
      from  7acb879850326a245aba03b63dd5849b3cd8ef6a (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=6098881a8721df0a29dbafbc4ca9c55ccc692979
commit 6098881a8721df0a29dbafbc4ca9c55ccc692979
Merge: 7acb879 c5731d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 22 08:25:00 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 22 08:25:00 2013 -0500

    Merge topic 'ExternalData-spaces' into next
    
    c5731d1 ExternalData: Fix test on make tools not supporting spaces


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5731d1b664a4aa329d4804b547495fe78d534cd
commit c5731d1b664a4aa329d4804b547495fe78d534cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 22 08:21:53 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 22 08:22:51 2013 -0500

    ExternalData: Fix test on make tools not supporting spaces
    
    Do not add the "DATA{Data Space.dat}" when the native build tool does
    not support spaces.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d74fffd..13c2aad 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -347,6 +347,7 @@ if(BUILD_TESTING)
     --build-project ExternalDataTest
     --build-noclean
     --force-new-ctest-process
+    --build-options -DMAKE_SUPPORTS_SPACES=${MAKE_SUPPORTS_SPACES}
     --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} -V
     )
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Module/ExternalData")
diff --git a/Tests/Module/ExternalData/CMakeLists.txt b/Tests/Module/ExternalData/CMakeLists.txt
index 35a759d..a379dca 100644
--- a/Tests/Module/ExternalData/CMakeLists.txt
+++ b/Tests/Module/ExternalData/CMakeLists.txt
@@ -14,11 +14,15 @@ set(ExternalData_URL_TEMPLATES
 set(ExternalData_BINARY_ROOT "${CMAKE_CURRENT_BINARY_DIR}/ExternalData")
 file(REMOVE_RECURSE ${ExternalData_BINARY_ROOT}) # clean test
 
+if(MAKE_SUPPORTS_SPACES)
+  set(Data1CheckSpaces -D "DataSpace=DATA{Data Space.dat}")
+endif()
+
 ExternalData_Add_Test(Data1
   NAME Data1Check
   COMMAND ${CMAKE_COMMAND}
     -D Data=DATA{Data.dat}
-    -D "DataSpace=DATA{Data Space.dat}"
+    ${Data1CheckSpaces}
     -D SeriesA=DATA{SeriesA.dat,:}
     -D SeriesB=DATA{SeriesB.dat,:}
     -D SeriesC=DATA{SeriesC.dat,:}
diff --git a/Tests/Module/ExternalData/Data1Check.cmake b/Tests/Module/ExternalData/Data1Check.cmake
index 54a4156..f40b76c 100644
--- a/Tests/Module/ExternalData/Data1Check.cmake
+++ b/Tests/Module/ExternalData/Data1Check.cmake
@@ -2,9 +2,11 @@ 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}]]")
+if(DEFINED DataSpace)
+  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()
 endif()
 set(SeriesAn1 "1\\.dat")
 set(SeriesBn1 "_1\\.dat")

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt                       |    1 +
 Tests/Module/ExternalData/CMakeLists.txt   |    6 +++++-
 Tests/Module/ExternalData/Data1Check.cmake |    8 +++++---
 3 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake