summaryrefslogtreecommitdiffstats
path: root/Help/generator/Ninja Multi-Config.rst
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2020-01-16 15:34:43 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2020-01-16 15:34:43 (GMT)
commit310b58e96155edd0d7d39285639ae903a49df3dc (patch)
treea2d6b826d474f5a7ee0a5b1f326ccd5780c1f4e8 /Help/generator/Ninja Multi-Config.rst
parent1e728706de1457a25fe531d5905c28570a208a08 (diff)
downloadCMake-310b58e96155edd0d7d39285639ae903a49df3dc.zip
CMake-310b58e96155edd0d7d39285639ae903a49df3dc.tar.gz
CMake-310b58e96155edd0d7d39285639ae903a49df3dc.tar.bz2
Ninja Multi-Config: Rename variable to be more consistent
Also make some tweaks to the documentation.
Diffstat (limited to 'Help/generator/Ninja Multi-Config.rst')
-rw-r--r--Help/generator/Ninja Multi-Config.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Help/generator/Ninja Multi-Config.rst b/Help/generator/Ninja Multi-Config.rst
index 92ca760..248eb05 100644
--- a/Help/generator/Ninja Multi-Config.rst
+++ b/Help/generator/Ninja Multi-Config.rst
@@ -19,8 +19,8 @@ the desired ``build-<Config>.ninja`` file with ``ninja -f``. Running
``build-<Config>.ninja`` as the ``-f`` file and ``<target>`` as the build
target.
-If :variable:`CMAKE_NINJA_CROSS_CONFIG_ENABLE` is turned on, executables and
-libraries of any configuration can be built regardless of which
+If :variable:`CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE` is turned on, executables
+and libraries of any configuration can be built regardless of which
``build-<Config>.ninja`` file is used, simply by specifying
``<target>:<OtherConfig>`` as the Ninja target. You can also specify
``<target>:all`` to build a target in all configurations. Each
@@ -31,8 +31,8 @@ targets will always use the configuration specified in
Ninja for the same file to be output with different commands in the same build
graph.
-If :variable:`CMAKE_NINJA_CROSS_CONFIG_ENABLE` is not enabled, you can still
-build any target in ``build-<Config>.ninja`` by specifying
+If :variable:`CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE` is not enabled, you can
+still build any target in ``build-<Config>.ninja`` by specifying
``<target>:<Config>`` or ``<target>``, but not ``<target>:<OtherConfig>`` or
``<target>:all``.
@@ -60,8 +60,8 @@ This would build the ``Debug`` configuration of ``generator``, which would be
used to generate ``generated.c``, which would be used to build the ``Debug``
configuration of ``generated``.
-But if :variable:`CMAKE_NINJA_CROSS_CONFIG_ENABLE` is enabled, and you run the
-following instead:
+But if :variable:`CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE` is enabled, and you
+run the following instead:
.. code-block:: shell