summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-18 13:18:06 (GMT)
committerBrad King <brad.king@kitware.com>2015-06-18 13:18:06 (GMT)
commit8576c394b105b9697cefb6dbf7d105d74fa5ee60 (patch)
treee3d1e4542ea90659f5648b4fff56ec21f097a20c
parent86bde2ef3e5d56ca7326b51e6608a79a08eb90cd (diff)
parent1c9db7db2c60e23ed3e6b107956656221e965c21 (diff)
downloadCMake-8576c394b105b9697cefb6dbf7d105d74fa5ee60.zip
CMake-8576c394b105b9697cefb6dbf7d105d74fa5ee60.tar.gz
CMake-8576c394b105b9697cefb6dbf7d105d74fa5ee60.tar.bz2
Merge branch 'doc-CMAKE_GENERATOR_PLATFORM-typo' into release
-rw-r--r--Help/variable/CMAKE_GENERATOR_PLATFORM.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
index 5809b6a..5559eb7 100644
--- a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
+++ b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
@@ -5,7 +5,7 @@ Generator-specific target platform name specified by user.
Some CMake generators support a target platform name to be given
to the native build system to choose a compiler toolchain.
-If the user specifies a toolset name (e.g. via the cmake -A option)
+If the user specifies a platform name (e.g. via the cmake -A option)
the value will be available in this variable.
The value of this variable should never be modified by project code.