[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1568-g86b40b8

[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  86b40b81b043fa34877f99bbc2d4984c69e7a627 (commit)
       via  c3e238dd538322268a4475ac4454b35fe39a134e (commit)
       via  cab2e31443a38b1023ec46eb99759a4be941fea0 (commit)
      from  f4cfaf6c3f4d13d976f63de3d9f1f91b7d403d42 (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=86b40b81b043fa34877f99bbc2d4984c69e7a627
commit 86b40b81b043fa34877f99bbc2d4984c69e7a627
Merge: f4cfaf6 c3e238d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Mar 28 13:03:23 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 28 13:03:23 2014 -0400

    Merge topic 'hpux-processorcount' into next
    
    c3e238dd ProcessorCount: use mpsched on HPUX if machinfo is not present
    cab2e314 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3e238dd538322268a4475ac4454b35fe39a134e
commit c3e238dd538322268a4475ac4454b35fe39a134e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Mar 28 17:59:31 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Mar 28 18:02:49 2014 +0100

    ProcessorCount: use mpsched on HPUX if machinfo is not present
    
    Co-Author: Gerhard Grimm <gerhard.grimm at detec.com>

diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index 0fe0b32..e034a28 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -104,6 +104,18 @@ function(ProcessorCount var)
       string(REGEX MATCHALL "Number of CPUs = ([0-9]+)" procs "${machinfo_output}")
       set(count "${CMAKE_MATCH_1}")
       #message("ProcessorCount: trying machinfo '${ProcessorCount_cmd_machinfo}'")
+    else()
+      find_program(ProcessorCount_cmd_mpsched mpsched)
+      mark_as_advanced(ProcessorCount_cmd_mpsched)
+      if(ProcessorCount_cmd_mpsched)
+        execute_process(COMMAND ${ProcessorCount_cmd_mpsched} -s
+          OUTPUT_QUIET
+          ERROR_STRIP_TRAILING_WHITESPACE
+          ERROR_VARIABLE mpsched_output)
+        string(REGEX MATCHALL "Processor Count *: *([0-9]+)" procs "${mpsched_output}")
+        set(count "${CMAKE_MATCH_1}")
+        #message("ProcessorCount: trying mpsched -s '${ProcessorCount_cmd_mpsched}'")
+      endif()
     endif()
   endif()
 

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

Summary of changes:
 Modules/ProcessorCount.cmake |   12 ++++++++++++
 Source/CMakeVersion.cmake    |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake