diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-01 13:41:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-01 13:41:51 (GMT) |
| commit | 50d2d438ccf2bb9d5c6cc701e9cd2be6949a5c97 (patch) | |
| tree | 440ae764e2f3a3650f5f2cfbfffce82ccbd17ff6 | |
| parent | 287199074ffd212865d9dcc65ada8ae59d871f00 (diff) | |
| parent | 6ff1217b9cb9b94c8af63ae314e3ae75f289804d (diff) | |
| download | CMake-50d2d438ccf2bb9d5c6cc701e9cd2be6949a5c97.zip CMake-50d2d438ccf2bb9d5c6cc701e9cd2be6949a5c97.tar.gz CMake-50d2d438ccf2bb9d5c6cc701e9cd2be6949a5c97.tar.bz2 | |
Merge topic 'doc-crosscompiling-emulator-arg-list-3.15' into release-3.23
6ff1217b9c Help: Add missing versionadded to *CROSSCOMPILING_EMULATOR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7023
| -rw-r--r-- | Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst | 7 | ||||
| -rw-r--r-- | Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst index d7fb9b1..8b777e4 100644 --- a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst +++ b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst @@ -8,9 +8,10 @@ This command will be added as a prefix to :command:`add_test`, :command:`add_custom_command`, and :command:`add_custom_target` commands for built target system executables. -If this property contains a :ref:`semicolon-separated list <CMake Language -Lists>`, then the first value is the command and remaining values are its -arguments. +.. versionadded:: 3.15 + If this property contains a :ref:`semicolon-separated list <CMake Language + Lists>`, then the first value is the command and remaining values are its + arguments. This property is initialized by the value of the :variable:`CMAKE_CROSSCOMPILING_EMULATOR` variable if it is set when a target diff --git a/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst b/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst index 815da00..e21b35d 100644 --- a/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst +++ b/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst @@ -7,9 +7,10 @@ This variable is only used when :variable:`CMAKE_CROSSCOMPILING` is on. It should point to a command on the host system that can run executable built for the target system. -If this variable contains a :ref:`semicolon-separated list <CMake Language -Lists>`, then the first value is the command and remaining values are its -arguments. +.. versionadded:: 3.15 + If this variable contains a :ref:`semicolon-separated list <CMake Language + Lists>`, then the first value is the command and remaining values are its + arguments. The command will be used to run :command:`try_run` generated executables, which avoids manual population of the ``TryRunResults.cmake`` file. |