[Cmake-commits] CMake branch, next, updated. v3.3.2-3273-gff41c88

[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  ff41c88af4590a4b076c77e15aa7d640eb9f7396 (commit)
       via  c090805380f7335a0e570945fbb77b44238ec6a5 (commit)
      from  f89517a3a52c0399ced0407a968c2b93dbdeb4aa (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=ff41c88af4590a4b076c77e15aa7d640eb9f7396
commit ff41c88af4590a4b076c77e15aa7d640eb9f7396
Merge: f89517a c090805
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 25 10:19:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 25 10:19:45 2015 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c090805380f7335a0e570945fbb77b44238ec6a5
commit c090805380f7335a0e570945fbb77b44238ec6a5
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: Fri Sep 25 10:18:23 2015 -0400

    ProcessorCount: Implement with psrinfo tool on recent SunOS versions

diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index 8f21adf..fac01d9 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 processors" 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:
 Modules/ProcessorCount.cmake |   29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake