summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-06-04 12:35:05 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-06-04 12:37:55 (GMT)
commit842f70c49359bfd9a13e333f2571371f64d163e1 (patch)
tree7bb365330ba84dd07bdce19963f12fee3e6a6c59 /Help
parenta7d2efc15b117e404aeaf952c762a96ba34787a3 (diff)
parentfec441ec17d74b6444fad2a3e32a47dd19f1be5b (diff)
downloadCMake-842f70c49359bfd9a13e333f2571371f64d163e1.zip
CMake-842f70c49359bfd9a13e333f2571371f64d163e1.tar.gz
CMake-842f70c49359bfd9a13e333f2571371f64d163e1.tar.bz2
Merge topic 'emulator-arguments'
fec441ec17 Teach CROSSCOMPILING_EMULATOR to support arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3402
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst4
-rw-r--r--Help/release/dev/emulator-arguments.rst6
-rw-r--r--Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst4
3 files changed, 14 insertions, 0 deletions
diff --git a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
index a0811bc..87c5978 100644
--- a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
+++ b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
@@ -6,6 +6,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.
+
This property is initialized by the value of the
:variable:`CMAKE_CROSSCOMPILING_EMULATOR` variable if it is set when a target
is created.
diff --git a/Help/release/dev/emulator-arguments.rst b/Help/release/dev/emulator-arguments.rst
new file mode 100644
index 0000000..3edb790
--- /dev/null
+++ b/Help/release/dev/emulator-arguments.rst
@@ -0,0 +1,6 @@
+emulator-arguments
+------------------
+
+* The :variable:`CMAKE_CROSSCOMPILING_EMULATOR` variable and corresponding
+ :prop_tgt:`CROSSCOMPILING_EMULATOR` target property learned to support
+ arguments to the emulator.
diff --git a/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst b/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
index e7774f2..1d013b7 100644
--- a/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
+++ b/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
@@ -5,6 +5,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.
+
The command will be used to run :command:`try_run` generated executables,
which avoids manual population of the ``TryRunResults.cmake`` file.