[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1741-ga758f4c

[Rolf Eike Beer]

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  a758f4c8403d22928320b95e0eddc6935a23b9b4 (commit)
       via  be799d93d71db56e47d3a55a23fa0c300bdb31d7 (commit)
      from  df98eb27b741af912b23b0470b456b150818f888 (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=a758f4c8403d22928320b95e0eddc6935a23b9b4
commit a758f4c8403d22928320b95e0eddc6935a23b9b4
Merge: df98eb2 be799d9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 23 16:54:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 23 16:54:57 2013 -0500

    Merge topic 'debug-ProcessorCount' into next
    
    be799d9 ProcessorCount test: require SystemInformation process to work


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be799d93d71db56e47d3a55a23fa0c300bdb31d7
commit be799d93d71db56e47d3a55a23fa0c300bdb31d7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 23 20:23:18 2013 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 23 22:54:30 2013 +0100

    ProcessorCount test: require SystemInformation process to work
    
    Currently this silently fails on some systems. Make sure those things get
    noticed so we can fix that.

diff --git a/Tests/CMakeTests/ProcessorCountTest.cmake.in b/Tests/CMakeTests/ProcessorCountTest.cmake.in
index 98f6ab1..62220b6 100644
--- a/Tests/CMakeTests/ProcessorCountTest.cmake.in
+++ b/Tests/CMakeTests/ProcessorCountTest.cmake.in
@@ -12,7 +12,14 @@ execute_process(
   COMMAND "@CMAKE_BINARY_DIR@/Source/kwsys/$ENV{CMAKE_CONFIG_TYPE}/cmsysTestsCxx"
   testSystemInformation
   OUTPUT_VARIABLE tsi_out
-  ERROR_VARIABLE tsi_err)
+  ERROR_VARIABLE tsi_err
+  RESULT_VARIABLE tsi_res
+)
+if (tsi_res)
+  message(SEND_ERROR "executing \"@CMAKE_BINARY_DIR@/Source/kwsys/$ENV{CMAKE_CONFIG_TYPE}/cmsysTestsCxx\" failed")
+  message(FATAL_ERROR "output: ${tsi_res}")
+endif ()
+
 string(REGEX REPLACE "(.*)GetNumberOfPhysicalCPU:.([0-9]*)(.*)" "\\2"
   system_info_processor_count "${tsi_out}")
 

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

Summary of changes:
 Tests/CMakeTests/ProcessorCountTest.cmake.in |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake