diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-04 11:05:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-04 11:07:09 (GMT) |
| commit | b320eb48f32f082dfa88bb0e958770a1feff30b1 (patch) | |
| tree | cdeae0cb5e01781788cebf446327a20c68070f10 /Help/manual/cmake-variables.7.rst | |
| parent | 8b5539d1c27145a5b71d551c12fabe273a5f93dc (diff) | |
| parent | 1bdb8cd24782173e22946643eb3bbfed2e6b9dc8 (diff) | |
| download | CMake-b320eb48f32f082dfa88bb0e958770a1feff30b1.zip CMake-b320eb48f32f082dfa88bb0e958770a1feff30b1.tar.gz CMake-b320eb48f32f082dfa88bb0e958770a1feff30b1.tar.bz2 | |
Merge topic 'compiler-version-internal'
1bdb8cd2 IAR: Detect compiler platform version
b96ca728 Add infrastructure to detect secondary compiler version information
f952f16d Help: Fix placement of one variable in cmake-variables manual
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1324
Diffstat (limited to 'Help/manual/cmake-variables.7.rst')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 66d3049..2e369e3 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -397,9 +397,10 @@ Variables for Languages /variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN /variable/CMAKE_LANG_COMPILER_ID /variable/CMAKE_LANG_COMPILER_LOADED + /variable/CMAKE_LANG_COMPILER_PREDEFINES_COMMAND /variable/CMAKE_LANG_COMPILER_TARGET /variable/CMAKE_LANG_COMPILER_VERSION - /variable/CMAKE_LANG_COMPILER_PREDEFINES_COMMAND + /variable/CMAKE_LANG_COMPILER_VERSION_INTERNAL /variable/CMAKE_LANG_COMPILE_OBJECT /variable/CMAKE_LANG_CREATE_SHARED_LIBRARY /variable/CMAKE_LANG_CREATE_SHARED_MODULE |