[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5968-g3dee521

[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  3dee5214eb6cc6d3afd5d0ca02ed6ab88d571ee1 (commit)
       via  eef42a0de6764628187263aca4a6cbabb6592501 (commit)
      from  5b02decb7434938aa8605327ab07b6ea85d2a941 (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=3dee5214eb6cc6d3afd5d0ca02ed6ab88d571ee1
commit 3dee5214eb6cc6d3afd5d0ca02ed6ab88d571ee1
Merge: 5b02dec eef42a0
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Dec 2 11:51:59 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 2 11:51:59 2013 -0500

    Merge topic 'Haiku-CPU-count' into next
    
    eef42a0 ProcessorCount: make it work on Haiku


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eef42a0de6764628187263aca4a6cbabb6592501
commit eef42a0de6764628187263aca4a6cbabb6592501
Author:     Rolf Eike Beer <kde at opensource.sf-tec.de>
AuthorDate: Sun Dec 1 16:53:46 2013 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Dec 2 17:51:47 2013 +0100

    ProcessorCount: make it work on Haiku

diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index 22ee776..0fe0b32 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -182,6 +182,20 @@ function(ProcessorCount var)
     endif()
   endif()
 
+  if(NOT count)
+    # Haiku
+    find_program(ProcessorCount_cmd_sysinfo sysinfo)
+    if(ProcessorCount_cmd_sysinfo)
+      execute_process(COMMAND ${ProcessorCount_cmd_sysinfo}
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE sysinfo_X_output)
+      string(REGEX MATCHALL "\nCPU #[0-9]+:" procs "\n${sysinfo_X_output}")
+      list(LENGTH procs count)
+      #message("ProcessorCount: trying sysinfo '${ProcessorCount_cmd_sysinfo}'")
+    endif()
+  endif()
+
   # Since cygwin builds of CMake do not define WIN32 anymore, but they still
   # run on Windows, and will still have this env var defined:
   #

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

Summary of changes:
 Modules/ProcessorCount.cmake |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake