summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-08 14:58:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-08 14:58:56 (GMT)
commit5a6c15155cbf18de60e118700e3e778f796e213d (patch)
treeedcf132f41e1dbf93627d78518d06c0536e03aaa /Source
parentf8241136b42c7e1064ca8764c6fa5e17012127da (diff)
parent3d8356d486ae736d1ba151aedfeb928222e7a084 (diff)
downloadCMake-5a6c15155cbf18de60e118700e3e778f796e213d.zip
CMake-5a6c15155cbf18de60e118700e3e778f796e213d.tar.gz
CMake-5a6c15155cbf18de60e118700e3e778f796e213d.tar.bz2
Merge topic 'clang-cl-compiler'
3d8356d Clang: Support Windows variants for GNU and MSVC (#13035, #14458) 51ab85c CMakeDetermineCompilerId: Add notion of "simulated" id/version be10826 CMakeDetermineCompilerId: Fix local var init
Diffstat (limited to 'Source')
-rw-r--r--Source/cmDocumentVariables.cxx22
1 files changed, 22 insertions, 0 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index c01a66e..8b5f851 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1675,6 +1675,28 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Variables for Languages");
cm->DefineProperty
+ ("CMAKE_<LANG>_SIMULATE_ID", cmProperty::VARIABLE,
+ "Identification string of \"simulated\" compiler.",
+ "Some compilers simulate other compilers to serve as drop-in "
+ "replacements. "
+ "When CMake detects such a compiler it sets this variable to what "
+ "would have been the CMAKE_<LANG>_COMPILER_ID for the simulated "
+ "compiler.",
+ false,
+ "Variables for Languages");
+
+ cm->DefineProperty
+ ("CMAKE_<LANG>_SIMULATE_VERSION", cmProperty::VARIABLE,
+ "Version string of \"simulated\" compiler.",
+ "Some compilers simulate other compilers to serve as drop-in "
+ "replacements. "
+ "When CMake detects such a compiler it sets this variable to what "
+ "would have been the CMAKE_<LANG>_COMPILER_VERSION for the simulated "
+ "compiler.",
+ false,
+ "Variables for Languages");
+
+ cm->DefineProperty
("CMAKE_<LANG>_SIZEOF_DATA_PTR", cmProperty::VARIABLE,
"Size of pointer-to-data types for language <LANG>.",
"This holds the size (in bytes) of pointer-to-data types in the target "