[Cmake-commits] CMake branch, next, updated. v3.3.2-3348-g42730ac

[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  42730ac4f6debc07e91c90718899ed29a841f460 (commit)
       via  1ff96bf69c06b3cb55bd41ef1a958031d074baeb (commit)
      from  54912eae899621cb107574275329026bfee62ed4 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42730ac4f6debc07e91c90718899ed29a841f460
commit 42730ac4f6debc07e91c90718899ed29a841f460
Merge: 54912ea 1ff96bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 28 11:30:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 28 11:30:57 2015 -0400

    Merge topic 'ProcessorCount-SunOS-psrinfo' into next
    
    1ff96bf6 ProcessorCount: Implement with psrinfo tool on recent SunOS versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ff96bf69c06b3cb55bd41ef1a958031d074baeb
commit 1ff96bf69c06b3cb55bd41ef1a958031d074baeb
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Fri Sep 25 16:09:25 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 28 11:30:41 2015 -0400

    ProcessorCount: Implement with psrinfo tool on recent SunOS versions

diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index 8f21adf..2c5d5ae 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -171,17 +171,30 @@ function(ProcessorCount var)
   endif()
 
   if(NOT count)
-    # Sun (systems where uname -X emits "NumCPU" in its output):
-    find_program(ProcessorCount_cmd_uname uname)
-    mark_as_advanced(ProcessorCount_cmd_uname)
-    if(ProcessorCount_cmd_uname)
-      execute_process(COMMAND ${ProcessorCount_cmd_uname} -X
+    # Sun (systems where psrinfo tool is available)
+    find_program(ProcessorCount_cmd_psrinfo psrinfo PATHS /usr/sbin /sbin)
+    mark_as_advanced(ProcessorCount_cmd_psrinfo)
+    if (ProcessorCount_cmd_psrinfo)
+      execute_process(COMMAND ${ProcessorCount_cmd_psrinfo} -p -v
         ERROR_QUIET
         OUTPUT_STRIP_TRAILING_WHITESPACE
-        OUTPUT_VARIABLE uname_X_output)
-      string(REGEX MATCHALL "NumCPU = ([0-9]+)" procs "${uname_X_output}")
+        OUTPUT_VARIABLE psrinfo_output)
+      string(REGEX MATCH "([0-9]+) virtual processor" procs "${psrinfo_output}")
       set(count "${CMAKE_MATCH_1}")
-      #message("ProcessorCount: trying uname -X '${ProcessorCount_cmd_uname}'")
+      #message("ProcessorCount: trying psrinfo -p -v '${ProcessorCount_cmd_prvinfo}'")
+    else()
+      # Sun (systems where uname -X emits "NumCPU" in its output):
+      find_program(ProcessorCount_cmd_uname uname)
+      mark_as_advanced(ProcessorCount_cmd_uname)
+      if(ProcessorCount_cmd_uname)
+        execute_process(COMMAND ${ProcessorCount_cmd_uname} -X
+          ERROR_QUIET
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+          OUTPUT_VARIABLE uname_X_output)
+        string(REGEX MATCHALL "NumCPU = ([0-9]+)" procs "${uname_X_output}")
+        set(count "${CMAKE_MATCH_1}")
+        #message("ProcessorCount: trying uname -X '${ProcessorCount_cmd_uname}'")
+      endif()
     endif()
   endif()
 

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

Summary of changes:


hooks/post-receive
-- 
CMake