[Cmake-commits] CMake branch, next, updated. v2.8.9-573-g3850612

Rolf Eike Beer eike at sf-mail.de
Tue Sep 18 02:45:43 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  38506121bbbcdbbf0b5a98cb8595f785c6c60585 (commit)
       via  f35e35b058ab89f70923e5ad6d16f6299147fdba (commit)
      from  fed487bc2081748c3cc15352604b34c1c2e17e58 (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=38506121bbbcdbbf0b5a98cb8595f785c6c60585
commit 38506121bbbcdbbf0b5a98cb8595f785c6c60585
Merge: fed487b f35e35b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Sep 18 02:45:41 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 18 02:45:41 2012 -0400

    Merge topic 'document-MSVC-variables-12567' into next
    
    f35e35b add documentation for all MSVCxxx version variables (#12567)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f35e35b058ab89f70923e5ad6d16f6299147fdba
commit f35e35b058ab89f70923e5ad6d16f6299147fdba
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: Tue Sep 18 08:45:01 2012 +0200

    add documentation for all MSVCxxx version variables (#12567)

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 94cd5c2..5e7e081 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1,6 +1,8 @@
 #include "cmDocumentVariables.h"
 #include "cmake.h"
 
+#include <cmsys/ios/sstream>
+
 void cmDocumentVariables::DefineVariables(cmake* cm)
 {
   // Subsection: variables defined by cmake, that give
@@ -992,12 +994,33 @@ 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 ++)
+    {
+    const char minor = (char)('0' + (msvc_versions[i] % 10));
+    cmStdString varName = "MSVC";
+    cmsys_ios::ostringstream majorStr;
+
+    majorStr << (msvc_versions[i] / 10);
+    varName += majorStr.str();
+    if (msvc_versions[i] < 100)
+      {
+      varName += minor;
+      }
+
+    cmStdString verString = majorStr.str() + "." + minor;
+
+    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 +1040,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:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list