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:52 (GMT) |
| commit | 1841487566edcc2875318f79fc4be34611b174ee (patch) | |
| tree | b4ee82475b841e6112ca6b9265efd3666e7c832c | |
| parent | 21471a60470d8e01c7aa7a951613d58e764fc52f (diff) | |
| parent | 6ff1217b9cb9b94c8af63ae314e3ae75f289804d (diff) | |
| download | CMake-1841487566edcc2875318f79fc4be34611b174ee.zip CMake-1841487566edcc2875318f79fc4be34611b174ee.tar.gz CMake-1841487566edcc2875318f79fc4be34611b174ee.tar.bz2 | |
Merge topic 'doc-crosscompiling-emulator-arg-list-3.15'
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. |