[Cmake-commits] CMake branch, next, updated. v2.8.9-501-g96a7c6b
Rolf Eike Beer
eike at sf-mail.de
Wed Sep 12 15:46:38 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 96a7c6b7ab39f01d9ecc728751e4df3e0c3739d0 (commit)
via c10cb2fed7916af9983df814870d6d8de49a868a (commit)
from 65ef4a987c7208670b8d92c99e8801175497e0b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96a7c6b7ab39f01d9ecc728751e4df3e0c3739d0
commit 96a7c6b7ab39f01d9ecc728751e4df3e0c3739d0
Merge: 65ef4a9 c10cb2f
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Sep 12 15:46:23 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 12 15:46:23 2012 -0400
Merge topic 'document-MSVC-variables-12567' into next
c10cb2f add documentation for all MSVCxxx version variables (#12567)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c10cb2fed7916af9983df814870d6d8de49a868a
commit c10cb2fed7916af9983df814870d6d8de49a868a
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 9 14:02:59 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Sep 12 21:44:22 2012 +0200
add documentation for all MSVCxxx version variables (#12567)
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 94cd5c2..45f36a0 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -992,12 +992,32 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
false,
"Variables That Describe the System");
- cm->DefineProperty
- ("MSVC80", cmProperty::VARIABLE,
- "True when using Microsoft Visual C 8.0",
- "Set to true when the compiler is version 8.0 of Microsoft Visual C.",
- false,
- "Variables That Describe the System");
+ int msvc_versions[] = { 60, 70, 71, 80, 90, 100, 110, 0 };
+ for (int i = 0; msvc_versions[i] != 0; i ++)
+ {
+ cmStdString varName = "MSVC";
+ cmsys_ios::ostringstream majorStr;
+ majorStr << (msvc_versions[i] / 10);
+ varName += majorStr.str();
+ if (msvc_versions[i] < 100)
+ {
+ varName += ('0' + msvc_versions[i] % 10);
+ }
+
+ cmStdString verString = majorStr.str() + ".";
+ verString += ('0' + msvc_versions[i] % 10);
+
+ cmStdString shortStr = "True when using Microsoft Visual C " + verString;
+ cmStdString fullStr = "Set to true when the compiler is version " +
+ verString +
+ " of Microsoft Visual C.";
+ cm->DefineProperty
+ (varName.c_str(), cmProperty::VARIABLE,
+ shortStr.c_str(),
+ fullStr.c_str(),
+ false,
+ "Variables That Describe the System");
+ }
cm->DefineProperty
("MSVC_IDE", cmProperty::VARIABLE,
@@ -1017,6 +1037,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
" 1400 = VS 8.0\n"
" 1500 = VS 9.0\n"
" 1600 = VS 10.0\n"
+ " 1700 = VS 11.0\n"
"",
false,
"Variables That Describe the System");
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentVariables.cxx | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list