summaryrefslogtreecommitdiffstats
path: root/Modules/ProcessorCount.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-12-03 13:48:57 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-12-03 13:49:25 (GMT)
commit0eead931a370eb136dd2723192528ddce7ca69d1 (patch)
tree556f3d0f592951d1d687349be9e5861172468605 /Modules/ProcessorCount.cmake
parentd4992ca605149bbea2ec43d8dad5544063eec3f7 (diff)
parent5000f93a91a5a9f0964d415692ffc05df0114eb1 (diff)
downloadCMake-0eead931a370eb136dd2723192528ddce7ca69d1.zip
CMake-0eead931a370eb136dd2723192528ddce7ca69d1.tar.gz
CMake-0eead931a370eb136dd2723192528ddce7ca69d1.tar.bz2
Merge topic 'versionadded'
5000f93a91 Help: Fix grammar in `.. versionadded` directives 8fea95319b Help: Add `.. versionadded` directives to module docs 8634561dca Help: Improve formatting for FindBoost and FindCUDA ea59b0cd34 Help: Fix version note for CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE 05c3060b10 Help: Fix cmake_parse_arguments version note dafcef8b50 Help: Improve styling for versionadded/deprecated directives 6ae216daef Tests: Make RunCMake.CMP0106 expected output robust to line number changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5560
Diffstat (limited to 'Modules/ProcessorCount.cmake')
-rw-r--r--Modules/ProcessorCount.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index 43ec889..bda23ab 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -15,6 +15,9 @@ Otherwise it is set to 0. Currently this functionality is implemented
for AIX, cygwin, FreeBSD, HPUX, Linux, macOS, QNX, Sun and
Windows.
+.. versionchanged:: 3.15
+ On Linux, returns the container CPU count instead of the host CPU count.
+
This function is guaranteed to return a positive integer (>=1) if it
succeeds. It returns 0 if there's a problem determining the processor
count.