diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-01 12:20:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-01 12:20:43 (GMT) |
| commit | 9921b2f8c897d6981e9003353962529d0d52f580 (patch) | |
| tree | 84f236d0db419673f68abfd53f343d523c0e1033 /Help | |
| parent | 38a4e5883f1503cdde2f32c6dd1074d6386d3e4f (diff) | |
| parent | 39c898a107269a488b9dcb72bf99c545ab35e54c (diff) | |
| download | CMake-9921b2f8c897d6981e9003353962529d0d52f580.zip CMake-9921b2f8c897d6981e9003353962529d0d52f580.tar.gz CMake-9921b2f8c897d6981e9003353962529d0d52f580.tar.bz2 | |
Merge topic 'doc-cmake-A-link'
39c898a1 Help: Clarify that `cmake -A` option sets VS IDE target architecture
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/Visual Studio 10 2010.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 11 2012.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 12 2013.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 14 2015.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 15.rst | 2 | ||||
| -rw-r--r-- | Help/manual/OPTIONS_BUILD.txt | 8 |
6 files changed, 10 insertions, 8 deletions
diff --git a/Help/generator/Visual Studio 10 2010.rst b/Help/generator/Visual Studio 10 2010.rst index 77ea9df..c694443 100644 --- a/Help/generator/Visual Studio 10 2010.rst +++ b/Help/generator/Visual Studio 10 2010.rst @@ -4,7 +4,7 @@ Visual Studio 10 2010 Generates Visual Studio 10 (VS 2010) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 11 2012.rst b/Help/generator/Visual Studio 11 2012.rst index 5fa7f2c..2f1e729 100644 --- a/Help/generator/Visual Studio 11 2012.rst +++ b/Help/generator/Visual Studio 11 2012.rst @@ -4,7 +4,7 @@ Visual Studio 11 2012 Generates Visual Studio 11 (VS 2012) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 12 2013.rst b/Help/generator/Visual Studio 12 2013.rst index 2c3b119..6e8545b 100644 --- a/Help/generator/Visual Studio 12 2013.rst +++ b/Help/generator/Visual Studio 12 2013.rst @@ -4,7 +4,7 @@ Visual Studio 12 2013 Generates Visual Studio 12 (VS 2013) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 14 2015.rst b/Help/generator/Visual Studio 14 2015.rst index b35997a..707caf9 100644 --- a/Help/generator/Visual Studio 14 2015.rst +++ b/Help/generator/Visual Studio 14 2015.rst @@ -4,7 +4,7 @@ Visual Studio 14 2015 Generates Visual Studio 14 (VS 2015) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 15.rst b/Help/generator/Visual Studio 15.rst index 2b9e33a..ae456eb 100644 --- a/Help/generator/Visual Studio 15.rst +++ b/Help/generator/Visual Studio 15.rst @@ -4,7 +4,7 @@ Visual Studio 15 Generates Visual Studio 15 project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt index b428a74..fa0e4c1 100644 --- a/Help/manual/OPTIONS_BUILD.txt +++ b/Help/manual/OPTIONS_BUILD.txt @@ -66,10 +66,12 @@ Specify platform name if supported by generator. Some CMake generators support a platform name to be given to the - native build system to choose a compiler or SDK. This is supported only on - specific generators:: + native build system to choose a compiler or SDK. See the + :variable:`CMAKE_GENERATOR_PLATFORM` variable. + This is supported only on specific generators: - Visual Studio >= 8 + * For :ref:`Visual Studio Generators` with VS 2005 and above this + specifies the target architecture. See native build system documentation for allowed platform names. |