[Cmake-commits] CMake branch, master, updated. v3.12.2-573-g78d165c

[Kitware Robot]

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, master has been updated
       via  78d165c9905f73237229497772769a6dc2c32982 (commit)
       via  151fc668273ca69ce0a75c1c03b489b08e531f10 (commit)
       via  3914108c4aecc758e0f23dda76ca4ad5cc1c1085 (commit)
       via  228a2b0d825712d6648f7bdf920850c7f38ed2b4 (commit)
      from  e895a8f050d5e68a8e23dea7fb3e5a718344cd03 (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=78d165c9905f73237229497772769a6dc2c32982
commit 78d165c9905f73237229497772769a6dc2c32982
Merge: 151fc66 3914108
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Tue Sep 11 09:50:55 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Sep 11 05:51:03 2018 -0400

    Merge topic 'generator_expressions_typo_fix'
    
    3914108c4a Help: Formatting typo fix in cmake-generator-expressions(7)
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2360


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=151fc668273ca69ce0a75c1c03b489b08e531f10
commit 151fc668273ca69ce0a75c1c03b489b08e531f10
Merge: e895a8f 228a2b0
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Tue Sep 11 09:48:33 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Sep 11 05:48:43 2018 -0400

    Merge topic 'cmake-host-system-information-doc-fix'
    
    228a2b0d82 Help: Clarify cmake_host_system_information memory units
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2339


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3914108c4aecc758e0f23dda76ca4ad5cc1c1085
commit 3914108c4aecc758e0f23dda76ca4ad5cc1c1085
Author:     Raul Tambre <raul.tambre at gmail.com>
AuthorDate: Mon Sep 10 15:08:02 2018 +0300
Commit:     Raul Tambre <raul.tambre at gmail.com>
CommitDate: Mon Sep 10 15:08:02 2018 +0300

    Help: Formatting typo fix in cmake-generator-expressions(7)

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 8fd07d7..c3428d1 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -51,7 +51,7 @@ Available logical expressions are:
   ``0`` if all ``?`` are ``0``, else ``1``
 ``$<NOT:?>``
   ``0`` if ``?`` is ``1``, else ``1``
-``$<IF:?,true-value...,false-value...>```
+``$<IF:?,true-value...,false-value...>``
   ``true-value...`` if ``?`` is ``1``, ``false-value...`` if ``?`` is ``0``
 ``$<STREQUAL:a,b>``
   ``1`` if ``a`` is STREQUAL ``b``, else ``0``

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=228a2b0d825712d6648f7bdf920850c7f38ed2b4
commit 228a2b0d825712d6648f7bdf920850c7f38ed2b4
Author:     Taylor Holberton <taylorcholberton at gmail.com>
AuthorDate: Sun Sep 2 10:16:56 2018 -0400
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Mon Sep 10 15:55:07 2018 +0800

    Help: Clarify cmake_host_system_information memory units
    
    The memory size query implementations report in units of one mebibyte
    (2^20).  Clarify the unit in the documentation because "megabyte" might
    also be interpreted as 10^6.

diff --git a/Help/command/cmake_host_system_information.rst b/Help/command/cmake_host_system_information.rst
index 9893151..2dee93a 100644
--- a/Help/command/cmake_host_system_information.rst
+++ b/Help/command/cmake_host_system_information.rst
@@ -20,10 +20,10 @@ Key                           Description
 ``NUMBER_OF_PHYSICAL_CORES``  Number of physical cores
 ``HOSTNAME``                  Hostname
 ``FQDN``                      Fully qualified domain name
-``TOTAL_VIRTUAL_MEMORY``      Total virtual memory in megabytes
-``AVAILABLE_VIRTUAL_MEMORY``  Available virtual memory in megabytes
-``TOTAL_PHYSICAL_MEMORY``     Total physical memory in megabytes
-``AVAILABLE_PHYSICAL_MEMORY`` Available physical memory in megabytes
+``TOTAL_VIRTUAL_MEMORY``      Total virtual memory in MiB [#mebibytes]_
+``AVAILABLE_VIRTUAL_MEMORY``  Available virtual memory in MiB [#mebibytes]_
+``TOTAL_PHYSICAL_MEMORY``     Total physical memory in MiB [#mebibytes]_
+``AVAILABLE_PHYSICAL_MEMORY`` Available physical memory in MiB [#mebibytes]_
 ``IS_64BIT``                  One if processor is 64Bit
 ``HAS_FPU``                   One if processor has floating point unit
 ``HAS_MMX``                   One if processor supports MMX instructions
@@ -44,3 +44,7 @@ Key                           Description
 ``OS_VERSION``                The OS build ID
 ``OS_PLATFORM``               See :variable:`CMAKE_HOST_SYSTEM_PROCESSOR`
 ============================= ================================================
+
+.. rubric:: Footnotes
+
+.. [#mebibytes] One MiB (mebibyte) is equal to 1024x1024 bytes.

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

Summary of changes:
 Help/command/cmake_host_system_information.rst | 12 ++++++++----
 Help/manual/cmake-generator-expressions.7.rst  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake