[Cmake-commits] CMake branch, next, updated. v3.3.2-3346-g54912ea

[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  54912eae899621cb107574275329026bfee62ed4 (commit)
       via  1720e12bea119032968ecf8a83835c549d106c7a (commit)
      from  dad180e984c83da8c1ff0d21903d974fef6cd9eb (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=54912eae899621cb107574275329026bfee62ed4
commit 54912eae899621cb107574275329026bfee62ed4
Merge: dad180e 1720e12
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 28 11:30:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 28 11:30:33 2015 -0400

    Merge topic 'ProcessorCount-SunOS-psrinfo' into next
    
    1720e12b fixup! ProcessorCount: Implement with psrinfo tool on recent SunOS versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1720e12bea119032968ecf8a83835c549d106c7a
commit 1720e12bea119032968ecf8a83835c549d106c7a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 28 11:30:13 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 28 11:30:13 2015 -0400

    fixup! ProcessorCount: Implement with psrinfo tool on recent SunOS versions

diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index fac01d9..2c5d5ae 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -179,7 +179,7 @@ function(ProcessorCount var)
         ERROR_QUIET
         OUTPUT_STRIP_TRAILING_WHITESPACE
         OUTPUT_VARIABLE psrinfo_output)
-      string(REGEX MATCH "([0-9]+) virtual processors" procs "${psrinfo_output}")
+      string(REGEX MATCH "([0-9]+) virtual processor" procs "${psrinfo_output}")
       set(count "${CMAKE_MATCH_1}")
       #message("ProcessorCount: trying psrinfo -p -v '${ProcessorCount_cmd_prvinfo}'")
     else()

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

Summary of changes:
 Modules/ProcessorCount.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake