[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-464-g14ab1e9

[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  14ab1e900306331d66ab6ef384cf1cc2f85dab1b (commit)
       via  3f9274f610a957bf9186365a212a50a6785acbed (commit)
      from  750906500d08cff001762412c2f307022836a879 (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=14ab1e900306331d66ab6ef384cf1cc2f85dab1b
commit 14ab1e900306331d66ab6ef384cf1cc2f85dab1b
Merge: 7509065 3f9274f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 14 09:01:50 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 14 09:01:50 2016 -0400

    Merge topic 'vs-host-x64-tools' into next
    
    3f9274f6 fixup! VS: Provide an option to use x64 host tools


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f9274f610a957bf9186365a212a50a6785acbed
commit 3f9274f610a957bf9186365a212a50a6785acbed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 14 09:01:34 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 14 09:01:34 2016 -0400

    fixup! VS: Provide an option to use x64 host tools

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index f76c467..ef7f0c0 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -82,6 +82,7 @@ Variables that Provide Information
    /variable/CMAKE_VS_NsightTegra_VERSION
    /variable/CMAKE_VS_PLATFORM_NAME
    /variable/CMAKE_VS_PLATFORM_TOOLSET
+   /variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
    /variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
    /variable/CMAKE_XCODE_PLATFORM_TOOLSET
    /variable/PROJECT_BINARY_DIR
diff --git a/Help/release/dev/vs-host-x64-tools.rst b/Help/release/dev/vs-host-x64-tools.rst
new file mode 100644
index 0000000..e42881a
--- /dev/null
+++ b/Help/release/dev/vs-host-x64-tools.rst
@@ -0,0 +1,7 @@
+vs-host-x64-tools
+-----------------
+
+* The :ref:`Visual Studio Generators` for VS 2013 and above learned to
+  support a ``host=x64`` option in the :variable:`CMAKE_GENERATOR_TOOLSET`
+  value (e.g.  via the :manual:`cmake(1)` ``-T`` option) to request use
+  of a VS 64-bit toolchain on 64-bit hosts.
diff --git a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
new file mode 100644
index 0000000..2af3a93
--- /dev/null
+++ b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
@@ -0,0 +1,12 @@
+CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
+-------------------------------------------
+
+Visual Studio preferred tool architecture (``x64`` or empty).
+
+The :ref:`Visual Studio Generators` for VS 2013 and above support optional
+selection of a 64-bit toolchain on 64-bit hosts by specifying a ``host=64``
+value in the :variable:`CMAKE_GENERATOR_TOOLSET` option.  The value of this
+variable indicates the selected toolchain architecture preference.  Note
+that this is only a preference specified in the generated project files.
+MSBuild may still choose a different tool architecture, such as when on
+a 32-bit host.

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

Summary of changes:
 Help/manual/cmake-variables.7.rst                          |    1 +
 Help/release/dev/vs-host-x64-tools.rst                     |    7 +++++++
 .../CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst        |   12 ++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 Help/release/dev/vs-host-x64-tools.rst
 create mode 100644 Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst


hooks/post-receive
-- 
CMake