summaryrefslogtreecommitdiffstats
path: root/Help/command
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-08 13:07:03 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-04-08 13:07:03 (GMT)
commit977796e3077b390b72c32315138ca15ae3339fb7 (patch)
tree78d5a827316d2d9ca59bffe7aab4713359cfcb42 /Help/command
parent37ce091345f6e9ad57aff7a768cc3dc35ebc3913 (diff)
parent1975d53ae19c46ee4f7384cc96be355f7e94df61 (diff)
downloadCMake-977796e3077b390b72c32315138ca15ae3339fb7.zip
CMake-977796e3077b390b72c32315138ca15ae3339fb7.tar.gz
CMake-977796e3077b390b72c32315138ca15ae3339fb7.tar.bz2
Merge topic 'emulator-property'
1975d53a Help: Add notes for topic 'emulator-property' 9160d6c2 TestGenerator: Add CROSSCOMPILING_EMULATOR support. e942526b try_run: Use CMAKE_CROSSCOMPILING_EMULATOR. 579c4bec Properties: Add CROSSCOMPILING_EMULATOR target property.
Diffstat (limited to 'Help/command')
-rw-r--r--Help/command/try_run.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Help/command/try_run.rst b/Help/command/try_run.rst
index 43ee219..e3bd57d 100644
--- a/Help/command/try_run.rst
+++ b/Help/command/try_run.rst
@@ -73,7 +73,8 @@ When cross compiling, the executable compiled in the first step
usually cannot be run on the build host. The ``try_run`` command checks
the :variable:`CMAKE_CROSSCOMPILING` variable to detect whether CMake is in
cross-compiling mode. If that is the case, it will still try to compile
-the executable, but it will not try to run the executable. Instead it
+the executable, but it will not try to run the executable unless the
+:variable:`CMAKE_CROSSCOMPILING_EMULATOR` variable is set. Instead it
will create cache variables which must be filled by the user or by
presetting them in some CMake script file to the values the executable
would have produced if it had been run on its actual target platform.