summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-13 14:33:44 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-13 14:33:44 (GMT)
commitf2d250adf0c1740805480c7df4c6cbf565d2072a (patch)
treedccf654e7daac14a88236d238ad4b59733c8faa7
parent4aca67b0fb03c77b7621399ff6a7a2eae37af4f8 (diff)
parent81b2454757fb2f56c38730f86a100af9f5a1f75b (diff)
downloadCMake-f2d250adf0c1740805480c7df4c6cbf565d2072a.zip
CMake-f2d250adf0c1740805480c7df4c6cbf565d2072a.tar.gz
CMake-f2d250adf0c1740805480c7df4c6cbf565d2072a.tar.bz2
Merge branch 'doc-toolset-host-arch-typo' into release
-rw-r--r--Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
index 4c04e97..9b59c52 100644
--- a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
+++ b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
@@ -4,7 +4,7 @@ CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
Visual Studio preferred tool architecture.
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``
+selection of a 64-bit toolchain on 64-bit hosts by specifying a ``host=x64``
value in the :variable:`CMAKE_GENERATOR_TOOLSET` option. CMake provides
the selected toolchain architecture preference in this variable (either
``x64`` or empty).