diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-20 18:02:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-20 18:02:52 (GMT) |
| commit | 5e0e65c18926b0a9c5b66ff4ec93d45cc008d383 (patch) | |
| tree | 2d9276431fe32440bb6e83a2f2406731f3a0e2de /Help/manual | |
| parent | 8056dda8a2406b63c94d4aca3f79187747c0a120 (diff) | |
| parent | 66b641f443a1d3fc8b5f74233307ba9b0929d340 (diff) | |
| download | CMake-5e0e65c18926b0a9c5b66ff4ec93d45cc008d383.zip CMake-5e0e65c18926b0a9c5b66ff4ec93d45cc008d383.tar.gz CMake-5e0e65c18926b0a9c5b66ff4ec93d45cc008d383.tar.bz2 | |
Merge topic 'add-GreenHills-MULTI-generator'
66b641f4 Help: Add notes for topic 'add-GreenHills-MULTI-generator'
48004d9d Add a 'Green Hills MULTI' generator on Windows
051d8be1 cmLocalGenerator: Constify some cmTarget and cmGeneratorTarget arguments
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-generators.7.rst | 1 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index 6f76fb1..723c308 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -73,6 +73,7 @@ Visual Studio Generators .. toctree:: :maxdepth: 1 + /generator/Green Hills MULTI /generator/Visual Studio 6 /generator/Visual Studio 7 /generator/Visual Studio 7 .NET 2003 diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 63f704d..865e1ef 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -182,6 +182,7 @@ Variables that Describe the System /variable/CMAKE_SYSTEM_VERSION /variable/CYGWIN /variable/ENV + /variable/GHS-MULTI /variable/MINGW /variable/MSVC10 /variable/MSVC11 @@ -307,6 +308,10 @@ Variables for Languages /variable/CMAKE_LANG_FLAGS_RELEASE /variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO /variable/CMAKE_LANG_FLAGS + /variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG + /variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL + /variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE + /variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELWITHDEBINFO /variable/CMAKE_LANG_IGNORE_EXTENSIONS /variable/CMAKE_LANG_IMPLICIT_INCLUDE_DIRECTORIES /variable/CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES |