diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-12 15:28:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-12 15:28:46 (GMT) |
| commit | 031ee74a63d98a4e21ba47eeb67ccd0b642b6daf (patch) | |
| tree | 3c3fe5416e649388035413520fa96b6ed3b324e1 | |
| parent | bd20dd6b8a925a421167602027fff9b904fd0822 (diff) | |
| parent | dbc0f63d11a36192a78bd31ac744337a73f53502 (diff) | |
| download | CMake-031ee74a63d98a4e21ba47eeb67ccd0b642b6daf.zip CMake-031ee74a63d98a4e21ba47eeb67ccd0b642b6daf.tar.gz CMake-031ee74a63d98a4e21ba47eeb67ccd0b642b6daf.tar.bz2 | |
Merge topic 'hpux-ProcessorCount'
dbc0f63d ProcessorCount: Update for HPUX 11iv3
| -rw-r--r-- | Modules/ProcessorCount.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
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) |