summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-28 10:49:16 -0500
committerBrad King <brad.king@kitware.com>2019-01-28 12:58:21 -0500
commit0fd742a6ffa637b8ccac3b61b42bd10b2c3a87cc (patch)
tree3f264f210f2e7ab523433b4f87509e581c7e9110 /Help
parent17cef3806d958bd03ec08b925fe585a0cfa204fa (diff)
downloadcmake-0fd742a6ffa637b8ccac3b61b42bd10b2c3a87cc.tar.gz
VS: Teach VS 2019 generator to select host tools matching host arch
This generator is new so we can introduce the long-desired behavior of selecting ``host=x64`` tools by default on x64 hosts.
Diffstat (limited to 'Help')
-rw-r--r--Help/generator/Visual Studio 16 2019.rst3
-rw-r--r--Help/release/dev/vs2019.rst3
2 files changed, 4 insertions, 2 deletions
diff --git a/Help/generator/Visual Studio 16 2019.rst b/Help/generator/Visual Studio 16 2019.rst
index 9d3da8b930..b456554b92 100644
--- a/Help/generator/Visual Studio 16 2019.rst
+++ b/Help/generator/Visual Studio 16 2019.rst
@@ -47,6 +47,7 @@ default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
via the :manual:`cmake(1)` ``-T`` option, to specify another toolset.
.. |VS_TOOLSET_HOST_ARCH_DEFAULT| replace::
- By default this generator uses the 32-bit variant even on a 64-bit host.
+ By default this generator uses the 64-bit variant on x64 hosts and
+ the 32-bit variant otherwise.
.. include:: VS_TOOLSET_HOST_ARCH.txt
diff --git a/Help/release/dev/vs2019.rst b/Help/release/dev/vs2019.rst
index 2072147200..ee9a2f2857 100644
--- a/Help/release/dev/vs2019.rst
+++ b/Help/release/dev/vs2019.rst
@@ -10,4 +10,5 @@ vs2019
in the generator name. Instead :variable:`CMAKE_GENERATOR_PLATFORM`
must be used, e.g. through the ``-A`` command-line option. Furthermore,
the default target platform (architecture) is now based on the *host*
- platform.
+ platform. The VS host toolset selection is now based on the host
+ architecture as well.