diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-22 13:22:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-22 13:22:44 (GMT) |
| commit | 89abbdd8c8db5bf587373f2a00f6a816eddd8496 (patch) | |
| tree | 815aaa6b4a54b6782bfb30550a20cfa6e4ee8ccb /Help | |
| parent | 4e47e9967aa9d4cd76375468e3b175cd313f3877 (diff) | |
| parent | 2c43fb5be345b75d12bba227979efd74b810b49a (diff) | |
| download | CMake-89abbdd8c8db5bf587373f2a00f6a816eddd8496.zip CMake-89abbdd8c8db5bf587373f2a00f6a816eddd8496.tar.gz CMake-89abbdd8c8db5bf587373f2a00f6a816eddd8496.tar.bz2 | |
Merge topic 'ghs-linux'
2c43fb5be3 FindThreads: Fix pthread library check in GHS Multi Generator
0404efe786 GHS: Add support for GHS Multi Generator in Linux
2060a1445c Tests: Fix file name case in GHS object library test
ddad70c8a4 Tests: Run GHS tests in a separate ctest process
f7dca1fc97 GHS: Fix include-what-you-use and clang-tidy diagnostics
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3006
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/Green Hills MULTI.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/ghs-linux.rst | 4 | ||||
| -rw-r--r-- | Help/variable/CMAKE_MAKE_PROGRAM.rst | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Help/generator/Green Hills MULTI.rst b/Help/generator/Green Hills MULTI.rst index e474682..09c5b15 100644 --- a/Help/generator/Green Hills MULTI.rst +++ b/Help/generator/Green Hills MULTI.rst @@ -33,12 +33,12 @@ Cache variables that are used for toolset and target system customization: * ``GHS_TOOLSET_ROOT`` | Root path for ``toolset`` searches. - | Defaults to ``C:/ghs``. + | Defaults to ``C:/ghs`` in Windows or ``/usr/ghs`` in Linux. * ``GHS_OS_ROOT`` | Root path for RTOS searches. - | Defaults to ``C:/ghs``. + | Defaults to ``C:/ghs`` in Windows or ``/usr/ghs`` in Linux. * ``GHS_OS_DIR`` diff --git a/Help/release/dev/ghs-linux.rst b/Help/release/dev/ghs-linux.rst new file mode 100644 index 0000000..6b663c8 --- /dev/null +++ b/Help/release/dev/ghs-linux.rst @@ -0,0 +1,4 @@ +ghs-linux +--------- + +* The :generator:`Green Hills MULTI` generator is now available on Linux. diff --git a/Help/variable/CMAKE_MAKE_PROGRAM.rst b/Help/variable/CMAKE_MAKE_PROGRAM.rst index 56df2df..a3c8b7c 100644 --- a/Help/variable/CMAKE_MAKE_PROGRAM.rst +++ b/Help/variable/CMAKE_MAKE_PROGRAM.rst @@ -52,7 +52,8 @@ to configure the project: possible. * The :generator:`Green Hills MULTI` generator sets this to the full - path to ``gbuild.exe`` based upon the toolset being used. + path to ``gbuild.exe(Windows)`` or ``gbuild(Linux)`` based upon + the toolset being used. Once the generator has initialized a particular value for this variable, changing the value has undefined behavior. |