[Cmake-commits] CMake branch, next, updated. v3.3.2-3445-g6d8ad4e

[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  6d8ad4e922aa85e22e5681c5ec999bffd9626b8d (commit)
       via  e1f21a06ef2c02dc5e01f91af18ba86991bfc54e (commit)
       via  852c41eac0a44c3168b6d9cedf34bbb1e354bece (commit)
      from  e23d906921f653bc7ef6bd1f6f261851a418edd1 (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=6d8ad4e922aa85e22e5681c5ec999bffd9626b8d
commit 6d8ad4e922aa85e22e5681c5ec999bffd9626b8d
Merge: e23d906 e1f21a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:42:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:42:13 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    e1f21a06 fixup! Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
    852c41ea Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1f21a06ef2c02dc5e01f91af18ba86991bfc54e
commit e1f21a06ef2c02dc5e01f91af18ba86991bfc54e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:41:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:41:48 2015 -0400

    fixup! Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME

diff --git a/Help/variable/CMAKE_SYSTEM_VERSION.rst b/Help/variable/CMAKE_SYSTEM_VERSION.rst
index f388ccf..aba8ca3 100644
--- a/Help/variable/CMAKE_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_SYSTEM_VERSION.rst
@@ -12,6 +12,13 @@ then ``CMAKE_SYSTEM_VERSION`` is by default set to the same value as the
 :variable:`CMAKE_HOST_SYSTEM_VERSION` variable so that the build targets
 the host system version.
 
+In the case of a host build then ``CMAKE_SYSTEM_VERSION`` may be set
+explicitly when first configuring a new build tree in order to enable
+targeting the build for a different version of the host operating system
+than is actually running on the host.  This is allowed and not considered
+cross compiling so long as the binaries built for the specified OS version
+can still run on the host.
+
 System Version for Cross Compiling
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=852c41eac0a44c3168b6d9cedf34bbb1e354bece
commit 852c41eac0a44c3168b6d9cedf34bbb1e354bece
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:36:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:36:52 2015 -0400

    Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation
    
    Specify their meaning for host builds and when cross compiling.
    Sepcify their relationship in each case.

diff --git a/Help/variable/CMAKE_SYSTEM_NAME.rst b/Help/variable/CMAKE_SYSTEM_NAME.rst
index 0466da4..c3a42e5 100644
--- a/Help/variable/CMAKE_SYSTEM_NAME.rst
+++ b/Help/variable/CMAKE_SYSTEM_NAME.rst
@@ -1,8 +1,20 @@
 CMAKE_SYSTEM_NAME
 -----------------
 
-Name of the operating system CMake is building for.
+The name of the operating system for which CMake is to build.
+See the :variable:`CMAKE_SYSTEM_VERSION` variable for the OS version.
 
-This is the name of the operating system on which CMake is targeting.  This
-variable is the same as :variable:`CMAKE_HOST_SYSTEM_NAME` if you build for the
-host system instead of the target system when cross compiling.
+System Name for Host Builds
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``CMAKE_SYSTEM_NAME`` is by default set to the same value as the
+:variable:`CMAKE_HOST_SYSTEM_NAME` variable so that the build
+targets the host system.
+
+System Name for Cross Compiling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``CMAKE_SYSTEM_NAME`` may be set explicitly when first configuring a new build
+tree in order to enable :ref:`cross compiling <Cross Compiling Toolchain>`.
+In this case the :variable:`CMAKE_SYSTEM_VERSION` variable must also be
+set explicitly.
diff --git a/Help/variable/CMAKE_SYSTEM_VERSION.rst b/Help/variable/CMAKE_SYSTEM_VERSION.rst
index 3b3cdc5..f388ccf 100644
--- a/Help/variable/CMAKE_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_SYSTEM_VERSION.rst
@@ -1,8 +1,21 @@
 CMAKE_SYSTEM_VERSION
 --------------------
 
-The operating system version CMake is building for.
+The version of the operating system for which CMake is to build.
+See the :variable:`CMAKE_SYSTEM_NAME` variable for the OS name.
 
-This variable is the same as :variable:`CMAKE_HOST_SYSTEM_VERSION` if
-you build for the host system instead of the target system when
-cross compiling.
+System Version for Host Builds
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When the :variable:`CMAKE_SYSTEM_NAME` variable takes its default value
+then ``CMAKE_SYSTEM_VERSION`` is by default set to the same value as the
+:variable:`CMAKE_HOST_SYSTEM_VERSION` variable so that the build targets
+the host system version.
+
+System Version for Cross Compiling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When the :variable:`CMAKE_SYSTEM_NAME` variable is set explicitly to
+enable :ref:`cross compiling <Cross Compiling Toolchain>` then the
+value of ``CMAKE_SYSTEM_VERSION`` must also be set explicitly to specify
+the target system version.

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

Summary of changes:
 Help/variable/CMAKE_SYSTEM_NAME.rst    |   20 ++++++++++++++++----
 Help/variable/CMAKE_SYSTEM_VERSION.rst |   28 ++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake