diff options
author | Brad King <brad.king@kitware.com> | 2014-09-15 14:27:38 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-15 14:27:38 (GMT) |
commit | b234836637d97b2d9cc837829c485ec87e64c5ce (patch) | |
tree | 294c854c5146ac45b5598f7220c36a4a4c7b8b6e /Help | |
parent | 9edf6903e62f84a567db3938bb8fec3f19789545 (diff) | |
parent | be6a555d7ec9348575e3431bd6709f48dc959100 (diff) | |
download | CMake-b234836637d97b2d9cc837829c485ec87e64c5ce.zip CMake-b234836637d97b2d9cc837829c485ec87e64c5ce.tar.gz CMake-b234836637d97b2d9cc837829c485ec87e64c5ce.tar.bz2 |
Merge topic 'vs-generator-platform'
be6a555d Tests: Test setting a generator platform in a toolchain file
d506fee8 Tests: Use -A option to pass generator platform selection
11c9ddd6 ExternalProject: Use -A option to pass generator platform
29bd843e CTest: Use -A option to pass generator platform selection
eb7d8156 cmake: Add -A option to specify a generator platform
Diffstat (limited to 'Help')
-rw-r--r-- | Help/manual/OPTIONS_BUILD.txt | 11 | ||||
-rw-r--r-- | Help/release/dev/vs-generator-platform.rst | 4 | ||||
-rw-r--r-- | Help/variable/CMAKE_GENERATOR_PLATFORM.rst | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt index 2079c44..363d0aa 100644 --- a/Help/manual/OPTIONS_BUILD.txt +++ b/Help/manual/OPTIONS_BUILD.txt @@ -51,6 +51,17 @@ See native build system documentation for allowed toolset names. +``-A <platform-name>`` + 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:: + + Visual Studio >= 8 + + See native build system documentation for allowed platform names. + ``-Wno-dev`` Suppress developer warnings. diff --git a/Help/release/dev/vs-generator-platform.rst b/Help/release/dev/vs-generator-platform.rst index df90e19..cf2090b 100644 --- a/Help/release/dev/vs-generator-platform.rst +++ b/Help/release/dev/vs-generator-platform.rst @@ -4,4 +4,6 @@ vs-generator-platform * The Visual Studio generators for versions 8 (2005) and above learned to read the target platform name from a new :variable:`CMAKE_GENERATOR_PLATFORM` variable when it is - not specified as part of the generator name. + not specified as part of the generator name. The platform + name may be specified on the :manual:`cmake(1)` command line + with the ``-A`` option, e.g. ``-G "Visual Studio 12 2013" -A x64``. diff --git a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst index 44d7fc4..5809b6a 100644 --- a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst +++ b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst @@ -5,6 +5,8 @@ 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) +the value will be available in this variable. The value of this variable should never be modified by project code. A toolchain file specified by the :variable:`CMAKE_TOOLCHAIN_FILE` |