[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-483-gd44e5c1
Kitware Robot
kwrobot at kitware.com
Mon Mar 13 10:45:02 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d44e5c1758448469acc2d93b334a0526a2ebc80a (commit)
via 3df2506fb549d57802ba2c7d99724210970791de (commit)
via 60546b4829ecaa34da88c9a0993b38b967d25925 (commit)
via 35c5cddcc51b8e2e6caaebc969ce3d7ae810dee3 (commit)
via 7df38939f9cc21d955c2daf5b6dc2cf70bbfca74 (commit)
via c750b28220ebe3cacb087935871c7750758fc225 (commit)
via 10f444a5c6015a10ef0b520c32ad65097facba2b (commit)
via 81b2454757fb2f56c38730f86a100af9f5a1f75b (commit)
from 9e226d96ade46b4b6a53dc88c1d3067919aae9c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d44e5c1758448469acc2d93b334a0526a2ebc80a
commit d44e5c1758448469acc2d93b334a0526a2ebc80a
Merge: 10f444a 3df2506
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 13 14:42:03 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 13 10:42:05 2017 -0400
Stage topic 'doc-vs-toolset-options'
Topic-id: 23018
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/580
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3df2506fb549d57802ba2c7d99724210970791de
commit 3df2506fb549d57802ba2c7d99724210970791de
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 13 10:07:13 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 13 10:36:58 2017 -0400
Help: Document VS generator toolset specification syntax
diff --git a/Help/generator/VS_TOOLSET_HOST_ARCH.txt b/Help/generator/VS_TOOLSET_HOST_ARCH.txt
index 58e9223..5d13e77 100644
--- a/Help/generator/VS_TOOLSET_HOST_ARCH.txt
+++ b/Help/generator/VS_TOOLSET_HOST_ARCH.txt
@@ -2,9 +2,5 @@ For each toolset that comes with this version of Visual Studio, there are
variants that are themselves compiled for 32-bit (x86) and 64-bit (x64) hosts
(independent of the architecture they target). By default Visual Studio
chooses the 32-bit variant even on a 64-bit host. One may request use of the
-64-bit host tools by adding ``host=x64`` to the toolset specification:
-
-``host=x64``
- Select the 64-bit variant of the default toolset.
-``<toolset>,host=x64``
- Select the 64-bit variant of the ``<toolset>`` toolset.
+64-bit host tools by adding a ``host=x64`` option to the toolset specification.
+See the :variable:`CMAKE_GENERATOR_TOOLSET` variable for details.
diff --git a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
index 68e4eb1..11c37d7 100644
--- a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
+++ b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
@@ -24,5 +24,27 @@ See native build system documentation for allowed toolset names.
Visual Studio Toolset Selection
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-On :ref:`Visual Studio Generators` the selected toolset name
+The :ref:`Visual Studio Generators` support toolset specification
+using one of these forms:
+
+* ``toolset``
+* ``toolset[,key=value]*``
+* ``key=value[,key=value]*``
+
+The ``toolset`` specifies the toolset name. The selected toolset name
is provided in the :variable:`CMAKE_VS_PLATFORM_TOOLSET` variable.
+
+The ``key=value`` pairs form a comma-separated list of options to
+specify generator-specific details of the toolset selection.
+Supported pairs are:
+
+``cuda=<version>``
+ Specify the CUDA toolkit version to use. Supported by VS 2010
+ and above with the CUDA toolkit VS integration installed.
+ See the :variable:`CMAKE_VS_PLATFORM_TOOLSET_CUDA` variable.
+
+``host=x64``
+ Request use of the native ``x64`` toolchain on ``x64`` hosts.
+ Supported by VS 2013 and above.
+ See the :variable:`CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE`
+ variable.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60546b4829ecaa34da88c9a0993b38b967d25925
commit 60546b4829ecaa34da88c9a0993b38b967d25925
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 13 10:03:30 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 13 10:36:58 2017 -0400
Help: Cross-reference generator toolset variables
diff --git a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
index 6a24197..68e4eb1 100644
--- a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
+++ b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
@@ -20,3 +20,9 @@ Toolset specification is supported only on specific generators:
* The :generator:`Xcode` generator for Xcode 3.0 and above
See native build system documentation for allowed toolset names.
+
+Visual Studio Toolset Selection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+On :ref:`Visual Studio Generators` the selected toolset name
+is provided in the :variable:`CMAKE_VS_PLATFORM_TOOLSET` variable.
diff --git a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
index 144a41d..ed2d3f3 100644
--- a/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
+++ b/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
@@ -8,3 +8,5 @@ compiler toolchains. CMake may specify a toolset explicitly, such as
``v110`` for VS 11 or ``Windows7.1SDK`` for 64-bit support in VS 10
Express. CMake provides the name of the chosen toolset in this
variable.
+
+See the :variable:`CMAKE_GENERATOR_TOOLSET` variable for details.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35c5cddcc51b8e2e6caaebc969ce3d7ae810dee3
commit 35c5cddcc51b8e2e6caaebc969ce3d7ae810dee3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 13 10:03:17 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 13 10:36:58 2017 -0400
Help: Cross-reference generator platform variables
diff --git a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
index 161ef20..50412ff 100644
--- a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
+++ b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
@@ -20,3 +20,9 @@ Platform specification is supported only on specific generators:
specifies the target architecture.
See native build system documentation for allowed platform names.
+
+Visual Studio Platform Selection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+On :ref:`Visual Studio Generators` the selected platform name
+is provided in the :variable:`CMAKE_VS_PLATFORM_NAME` variable.
diff --git a/Help/variable/CMAKE_VS_PLATFORM_NAME.rst b/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
index c6f8d41..a532743 100644
--- a/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
+++ b/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
@@ -5,3 +5,4 @@ Visual Studio target platform name.
VS 8 and above allow project files to specify a target platform.
CMake provides the name of the chosen platform in this variable.
+See the :variable:`CMAKE_GENERATOR_PLATFORM` variable for details.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7df38939f9cc21d955c2daf5b6dc2cf70bbfca74
commit 7df38939f9cc21d955c2daf5b6dc2cf70bbfca74
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 13 09:58:42 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 13 10:36:58 2017 -0400
Help: Move generator toolset support details to variable docs
Move the details about support for generator toolset specification
to the `CMAKE_GENERATOR_TOOLSET` variable documentation. This is
a more suitable place because it is shared by all means to set this
variable, not just the `cmake -T` option.
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt
index 1dc2a74..e8b87c9 100644
--- a/Help/manual/OPTIONS_BUILD.txt
+++ b/Help/manual/OPTIONS_BUILD.txt
@@ -48,18 +48,12 @@
build system. Possible generator names are specified in the
:manual:`cmake-generators(7)` manual.
-``-T <toolset-name>``
- Specify toolset name if supported by generator.
+``-T <toolset-spec>``
+ Toolset specification for the generator, if supported.
- Some CMake generators support a toolset name to be given to the
- native build system to choose a compiler.
- See the :variable:`CMAKE_GENERATOR_TOOLSET` variable.
- This is supported only on specific generators:
-
- * :ref:`Visual Studio Generators` for VS 2010 and above
- * The :generator:`Xcode` generator for Xcode 3.0 and above
-
- See native build system documentation for allowed toolset names.
+ Some CMake generators support a toolset specification to tell
+ the native build system how to choose a compiler. See the
+ :variable:`CMAKE_GENERATOR_TOOLSET` variable for details.
``-A <platform-name>``
Specify platform name if supported by generator.
diff --git a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
index 89abe54..6a24197 100644
--- a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
+++ b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
@@ -1,15 +1,22 @@
CMAKE_GENERATOR_TOOLSET
-----------------------
-Native build system toolset name specified by user.
+Native build system toolset specification provided by user.
-Some CMake generators support a toolset name to be given to the native
-build system to choose a compiler. If the user specifies a toolset
-name (e.g. via the :manual:`cmake(1)` ``-T`` option) the value will be
-available in this variable.
+Some CMake generators support a toolset specification to tell the
+native build system how to choose a compiler. If the user specifies
+a toolset (e.g. via the :manual:`cmake(1)` ``-T`` 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`
variable may initialize ``CMAKE_GENERATOR_TOOLSET``. Once a given
build tree has been initialized with a particular value for this
variable, changing the value has undefined behavior.
+
+Toolset specification is supported only on specific generators:
+
+* :ref:`Visual Studio Generators` for VS 2010 and above
+* The :generator:`Xcode` generator for Xcode 3.0 and above
+
+See native build system documentation for allowed toolset names.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c750b28220ebe3cacb087935871c7750758fc225
commit c750b28220ebe3cacb087935871c7750758fc225
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 13 09:56:45 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 13 10:36:57 2017 -0400
Help: Move generator platform support details to variable docs
Move the details about support for generator platform specification
to the `CMAKE_GENERATOR_PLATFORM` variable documentation. This is
a more suitable place because it is shared by all means to set this
variable, not just the `cmake -A` option.
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt
index 9b3f717..1dc2a74 100644
--- a/Help/manual/OPTIONS_BUILD.txt
+++ b/Help/manual/OPTIONS_BUILD.txt
@@ -66,13 +66,7 @@
Some CMake generators support a platform name to be given to the
native build system to choose a compiler or SDK. See the
- :variable:`CMAKE_GENERATOR_PLATFORM` variable.
- This is supported only on specific generators:
-
- * For :ref:`Visual Studio Generators` with VS 2005 and above this
- specifies the target architecture.
-
- See native build system documentation for allowed platform names.
+ :variable:`CMAKE_GENERATOR_PLATFORM` variable for details.
``-Wno-dev``
Suppress developer warnings.
diff --git a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
index a5c284a..161ef20 100644
--- a/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
+++ b/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
@@ -1,7 +1,7 @@
CMAKE_GENERATOR_PLATFORM
------------------------
-Generator-specific target platform name specified by user.
+Generator-specific target platform specification provided by user.
Some CMake generators support a target platform name to be given
to the native build system to choose a compiler toolchain.
@@ -13,3 +13,10 @@ A toolchain file specified by the :variable:`CMAKE_TOOLCHAIN_FILE`
variable may initialize ``CMAKE_GENERATOR_PLATFORM``. Once a given
build tree has been initialized with a particular value for this
variable, changing the value has undefined behavior.
+
+Platform specification is supported only on specific generators:
+
+* For :ref:`Visual Studio Generators` with VS 2005 and above this
+ specifies the target architecture.
+
+See native build system documentation for allowed platform names.
-----------------------------------------------------------------------
Summary of changes:
Help/generator/VS_TOOLSET_HOST_ARCH.txt | 8 +---
Help/manual/OPTIONS_BUILD.txt | 24 +++--------
Help/variable/CMAKE_GENERATOR_PLATFORM.rst | 15 ++++++-
Help/variable/CMAKE_GENERATOR_TOOLSET.rst | 45 +++++++++++++++++---
Help/variable/CMAKE_VS_PLATFORM_NAME.rst | 1 +
Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst | 2 +
...CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst | 2 +-
7 files changed, 66 insertions(+), 31 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list