summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorRobert Maynard <rmaynard@nvidia.com>2021-04-07 18:24:14 (GMT)
committerRobert Maynard <rmaynard@nvidia.com>2021-04-15 14:13:49 (GMT)
commitd5c3e4ac326328dd4ca48b12b27b11ea19d87363 (patch)
tree45d0f8e2a50582be6c89885fa52f36bb68d9080c /Help
parent13838bbb36dbfeb36243d661378732672477ac8a (diff)
downloadCMake-d5c3e4ac326328dd4ca48b12b27b11ea19d87363.zip
CMake-d5c3e4ac326328dd4ca48b12b27b11ea19d87363.tar.gz
CMake-d5c3e4ac326328dd4ca48b12b27b11ea19d87363.tar.bz2
cmake: add support for --toolchain command argument
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/OPTIONS_BUILD.txt4
-rw-r--r--Help/manual/cmake-toolchains.7.rst4
-rw-r--r--Help/release/dev/cmake-toolchain-command.rst5
3 files changed, 11 insertions, 2 deletions
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt
index c4f9be8..c4f83f7 100644
--- a/Help/manual/OPTIONS_BUILD.txt
+++ b/Help/manual/OPTIONS_BUILD.txt
@@ -76,6 +76,10 @@
native build system to choose a compiler or SDK. See the
:variable:`CMAKE_GENERATOR_PLATFORM` variable for details.
+``--toolchain <path-to-file>``
+ Specify the cross compiling toolchain file, equivalant to setting
+ :variable:`CMAKE_TOOLCHAIN_FILE` variable.
+
``--install-prefix <directory>``
Specify the installation directory, used by the
:variable:`CMAKE_INSTALL_PREFIX` variable. Must be an absolute path.
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index 1ededee..a941310 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -96,8 +96,8 @@ Cross Compiling
===============
If :manual:`cmake(1)` is invoked with the command line parameter
-``-DCMAKE_TOOLCHAIN_FILE=path/to/file``, the file will be loaded early to set
-values for the compilers.
+``--toolchain path/to/file`` or ``-DCMAKE_TOOLCHAIN_FILE=path/to/file``, the
+file will be loaded early to set values for the compilers.
The :variable:`CMAKE_CROSSCOMPILING` variable is set to true when CMake is
cross-compiling.
diff --git a/Help/release/dev/cmake-toolchain-command.rst b/Help/release/dev/cmake-toolchain-command.rst
new file mode 100644
index 0000000..111ca49
--- /dev/null
+++ b/Help/release/dev/cmake-toolchain-command.rst
@@ -0,0 +1,5 @@
+cmake-toolchain-command
+----------------------------
+
+* The :manual:`cmake(1)` command gained the ``--toolchain <path/to/file>``
+ command line option to specify a toolchain file.