[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1768-g6edb276

[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  6edb276a149ffce19aabdf99a15e7e53d29bd84a (commit)
       via  4d0e2e81e9c60f6f147f3b332b1d885d543b2084 (commit)
       via  e03f83f394c53acbcc9dcff03f189170b2f33322 (commit)
      from  5974abf950c4d784b85f56a763d1061ef5e926dc (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=6edb276a149ffce19aabdf99a15e7e53d29bd84a
commit 6edb276a149ffce19aabdf99a15e7e53d29bd84a
Merge: 5974abf 4d0e2e8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 24 18:32:07 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 24 18:32:07 2013 -0500

    Merge topic 'debug-ProcessorCount' into next
    
    4d0e2e8 ProcessorCount test: require SystemInformation process to work
    e03f83f ProcessorCount test: fix path to cmsysTestsCxx executable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d0e2e81e9c60f6f147f3b332b1d885d543b2084
commit 4d0e2e81e9c60f6f147f3b332b1d885d543b2084
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: Fri Jan 25 00:31:41 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 15e0219..f92dcc4 100644
--- a/Tests/CMakeTests/ProcessorCountTest.cmake.in
+++ b/Tests/CMakeTests/ProcessorCountTest.cmake.in
@@ -12,7 +12,14 @@ execute_process(
   COMMAND "${KWSYS_TEST_EXE}"
   testSystemInformation
   OUTPUT_VARIABLE tsi_out
-  ERROR_VARIABLE tsi_err)
+  ERROR_VARIABLE tsi_err
+  RESULT_VARIABLE tsi_res
+)
+if (tsi_res)
+  message("executing \"${KWSYS_TEST_EXE}\" failed")
+  message(FATAL_ERROR "output: ${tsi_res}")
+endif ()
+
 string(REGEX REPLACE "(.*)GetNumberOfPhysicalCPU:.([0-9]*)(.*)" "\\2"
   system_info_processor_count "${tsi_out}")
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e03f83f394c53acbcc9dcff03f189170b2f33322
commit e03f83f394c53acbcc9dcff03f189170b2f33322
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 24 23:15:13 2013 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 25 00:31:41 2013 +0100

    ProcessorCount test: fix path to cmsysTestsCxx executable
    
    Use a generator expression to get the real place of this target instead of
    guessing it wrong.

diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt
index d34d4a6..b049995 100644
--- a/Tests/CMakeTests/CMakeLists.txt
+++ b/Tests/CMakeTests/CMakeLists.txt
@@ -4,7 +4,8 @@ set(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake")
 macro(AddCMakeTest TestName PreArgs)
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${TestName}Test.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/${TestName}Test.cmake" @ONLY IMMEDIATE)
-  add_test(CMake.${TestName} ${CMAKE_EXECUTABLE} ${PreArgs}
+  add_test(NAME CMake.${TestName}
+    COMMAND ${CMAKE_EXECUTABLE} ${PreArgs}
     -P "${CMAKE_CURRENT_BINARY_DIR}/${TestName}Test.cmake" ${ARGN})
 endmacro()
 
@@ -28,7 +29,7 @@ AddCMakeTest(String "")
 AddCMakeTest(Math "")
 AddCMakeTest(CMakeMinimumRequired "")
 AddCMakeTest(CompilerIdVendor "")
-AddCMakeTest(ProcessorCount "")
+AddCMakeTest(ProcessorCount "-DKWSYS_TEST_EXE=$<TARGET_FILE:cmsysTestsCxx>")
 AddCMakeTest(PushCheckState "")
 AddCMakeTest(While "")
 
diff --git a/Tests/CMakeTests/ProcessorCountTest.cmake.in b/Tests/CMakeTests/ProcessorCountTest.cmake.in
index 98f6ab1..15e0219 100644
--- a/Tests/CMakeTests/ProcessorCountTest.cmake.in
+++ b/Tests/CMakeTests/ProcessorCountTest.cmake.in
@@ -9,7 +9,7 @@ message("### 3. ProcessorCount(...) function call is emitting output that it sho
 message("processor_count='${processor_count}'")
 
 execute_process(
-  COMMAND "@CMAKE_BINARY_DIR@/Source/kwsys/$ENV{CMAKE_CONFIG_TYPE}/cmsysTestsCxx"
+  COMMAND "${KWSYS_TEST_EXE}"
   testSystemInformation
   OUTPUT_VARIABLE tsi_out
   ERROR_VARIABLE tsi_err)

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

Summary of changes:


hooks/post-receive
-- 
CMake