summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-07-07 12:42:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-07-07 12:42:22 (GMT)
commit1ff7cd1fe7cdd408d55827bdc10058167a09cf45 (patch)
treeb72c7b7e4b905bc02b7d743516aef8bd416e5cc9 /Help/manual
parentd2617a28eb9f489d87be88851a313c58d5eaf027 (diff)
parentd8e6cd9ed8bfee9073cff26cb654bc01e653b0b9 (diff)
downloadCMake-1ff7cd1fe7cdd408d55827bdc10058167a09cf45.zip
CMake-1ff7cd1fe7cdd408d55827bdc10058167a09cf45.tar.gz
CMake-1ff7cd1fe7cdd408d55827bdc10058167a09cf45.tar.bz2
Merge topic 'iar_improved'
d8e6cd9e IAR: Improve support for IAR ARM Compiler 0b1a2876 Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variable fea7d69d Store CMAKE_ASM_COMPILER_VERSION persistently d2a8b5ce CMakeDetermineASMCompiler: Fix small copy-paste mistake a2112257 Add infrastructure to use language extensions without any standard 8cd28bb0 cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} check 0fc2d78e cmLocalGenerator: Simplify logic for language standard or extension flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !991
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-variables.7.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index ec8fedf..cc16b23 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -387,6 +387,7 @@ Variables for Languages
/variable/CMAKE_LANG_ARCHIVE_FINISH
/variable/CMAKE_LANG_COMPILER
/variable/CMAKE_LANG_COMPILER_ABI
+ /variable/CMAKE_LANG_COMPILER_ARCHITECTURE_ID
/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN
/variable/CMAKE_LANG_COMPILER_ID
/variable/CMAKE_LANG_COMPILER_LOADED