[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1765-g5974abf

[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  5974abf950c4d784b85f56a763d1061ef5e926dc (commit)
       via  64d53ac26ab7b76533dd1e348e6d3e122a502a55 (commit)
      from  2cf583761296c5dc6b6202f4155e5a08f2d0d4d2 (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=5974abf950c4d784b85f56a763d1061ef5e926dc
commit 5974abf950c4d784b85f56a763d1061ef5e926dc
Merge: 2cf5837 64d53ac
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 24 18:31:17 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 24 18:31:17 2013 -0500

    Merge topic 'debug-ProcessorCount' into next
    
    64d53ac (hopefully) fix ProcessorCount test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64d53ac26ab7b76533dd1e348e6d3e122a502a55
commit 64d53ac26ab7b76533dd1e348e6d3e122a502a55
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 25 00:30:17 2013 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 25 00:30:17 2013 +0100

    (hopefully) fix ProcessorCount test
    
    This commit will get overwritten in a minute, it is only here to make git
    happy.

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 62220b6..f92dcc4 100644
--- a/Tests/CMakeTests/ProcessorCountTest.cmake.in
+++ b/Tests/CMakeTests/ProcessorCountTest.cmake.in
@@ -9,14 +9,14 @@ 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
   RESULT_VARIABLE tsi_res
 )
 if (tsi_res)
-  message(SEND_ERROR "executing \"@CMAKE_BINARY_DIR@/Source/kwsys/$ENV{CMAKE_CONFIG_TYPE}/cmsysTestsCxx\" failed")
+  message("executing \"${KWSYS_TEST_EXE}\" failed")
   message(FATAL_ERROR "output: ${tsi_res}")
 endif ()
 

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

Summary of changes:
 Tests/CMakeTests/CMakeLists.txt              |    5 +++--
 Tests/CMakeTests/ProcessorCountTest.cmake.in |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake