[Cmake-commits] CMake branch, next, updated. v3.0.0-3681-g8804320

[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  8804320539e406a9ed2fdd5aa17bb152c8ff0eea (commit)
       via  dbc0f63d11a36192a78bd31ac744337a73f53502 (commit)
      from  056c65c753f100c5a3fbf291937c78c0b9edc462 (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=8804320539e406a9ed2fdd5aa17bb152c8ff0eea
commit 8804320539e406a9ed2fdd5aa17bb152c8ff0eea
Merge: 056c65c dbc0f63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 10 13:27:39 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 10 13:27:39 2014 -0400

    Merge topic 'hpux-ProcessorCount' into next
    
    dbc0f63d ProcessorCount: Update for HPUX 11iv3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbc0f63d11a36192a78bd31ac744337a73f53502
commit dbc0f63d11a36192a78bd31ac744337a73f53502
Author:     Eric Berge <ericmberge at gmail.com>
AuthorDate: Tue Jun 10 10:26:24 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 10 13:27:58 2014 -0400

    ProcessorCount: Update for HPUX 11iv3

diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index e034a28..8f21adf 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -103,6 +103,10 @@ function(ProcessorCount var)
         OUTPUT_VARIABLE machinfo_output)
       string(REGEX MATCHALL "Number of CPUs = ([0-9]+)" procs "${machinfo_output}")
       set(count "${CMAKE_MATCH_1}")
+      if(NOT count)
+        string(REGEX MATCHALL "([0-9]+) logical processors" procs "${machinfo_output}")
+        set(count "${CMAKE_MATCH_1}")
+      endif()
       #message("ProcessorCount: trying machinfo '${ProcessorCount_cmd_machinfo}'")
     else()
       find_program(ProcessorCount_cmd_mpsched mpsched)

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

Summary of changes:
 Modules/ProcessorCount.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake