diff options
author | Brad King <brad.king@kitware.com> | 2019-04-08 11:43:22 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-08 11:45:13 (GMT) |
commit | c756fbce9ba94e2d7f1b787d595df24dbe99c9c1 (patch) | |
tree | c33d897d80d3623677d90f40d9cba5ae9474b96f /Help/generator | |
parent | 99ce35ab9cbdac4a7cc626590f5e86c36ae29070 (diff) | |
parent | a1e6b414b9ade99a8f4e6bbe9bbff43ee1a05e88 (diff) | |
download | CMake-c756fbce9ba94e2d7f1b787d595df24dbe99c9c1.zip CMake-c756fbce9ba94e2d7f1b787d595df24dbe99c9c1.tar.gz CMake-c756fbce9ba94e2d7f1b787d595df24dbe99c9c1.tar.bz2 |
Merge topic 'ghs_os_dir'
a1e6b414b9 GHS: Update GHS_BSP_NAME processing
266dadf868 GHS: Print status message regarding GHS_OS_DIR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3123
Diffstat (limited to 'Help/generator')
-rw-r--r-- | Help/generator/Green Hills MULTI.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Help/generator/Green Hills MULTI.rst b/Help/generator/Green Hills MULTI.rst index 6626770..dffc679 100644 --- a/Help/generator/Green Hills MULTI.rst +++ b/Help/generator/Green Hills MULTI.rst @@ -41,11 +41,12 @@ Cache variables that are used for toolset and target system customization: | Root path for RTOS searches. | Defaults to ``C:/ghs`` in Windows or ``/usr/ghs`` in Linux. -* ``GHS_OS_DIR`` +* ``GHS_OS_DIR`` and ``GHS_OS_DIR_OPTION`` | Sets ``-os_dir`` entry in project file. | Defaults to latest platform OS installation at ``GHS_OS_ROOT``. Set this value if a specific RTOS is to be used. + | ``GHS_OS_DIR_OPTION`` default value is ``-os_dir``. * ``GHS_BSP_NAME`` |