소스 검색

cmake: Rename default generator selection list variable

Brad King 9 년 전
부모
커밋
d3df00ae53
1개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 5
      Source/cmake.cxx

+ 5 - 5
Source/cmake.cxx

@@ -1452,12 +1452,12 @@ void cmake::CreateDefaultGlobalGenerator()
   vsVerions.push_back("VisualStudio\\");
   vsVerions.push_back("VisualStudio\\");
   vsVerions.push_back("VCExpress\\");
   vsVerions.push_back("VCExpress\\");
   vsVerions.push_back("WDExpress\\");
   vsVerions.push_back("WDExpress\\");
-  struct VSRegistryEntryName
+  struct VSVersionedGenerator
   {
   {
     const char* MSVersion;
     const char* MSVersion;
     const char* GeneratorName;
     const char* GeneratorName;
   };
   };
-  VSRegistryEntryName version[] = {
+  static VSVersionedGenerator const vsGenerators[] = {
     /* clang-format needs this comment to break after the opening brace */
     /* clang-format needs this comment to break after the opening brace */
     { "7.1", "Visual Studio 7 .NET 2003" },
     { "7.1", "Visual Studio 7 .NET 2003" },
     { "8.0", "Visual Studio 8 2005" },
     { "8.0", "Visual Studio 8 2005" },
@@ -1469,15 +1469,15 @@ void cmake::CreateDefaultGlobalGenerator()
     { "15.0", "Visual Studio 15" },
     { "15.0", "Visual Studio 15" },
     { 0, 0 }
     { 0, 0 }
   };
   };
-  for (int i = 0; version[i].MSVersion != 0; i++) {
+  for (int i = 0; vsGenerators[i].MSVersion != 0; i++) {
     for (size_t b = 0; b < vsVerions.size(); b++) {
     for (size_t b = 0; b < vsVerions.size(); b++) {
-      std::string reg = vsregBase + vsVerions[b] + version[i].MSVersion;
+      std::string reg = vsregBase + vsVerions[b] + vsGenerators[i].MSVersion;
       reg += ";InstallDir";
       reg += ";InstallDir";
       std::string dir;
       std::string dir;
       if (cmSystemTools::ReadRegistryValue(reg, dir,
       if (cmSystemTools::ReadRegistryValue(reg, dir,
                                            cmSystemTools::KeyWOW64_32) &&
                                            cmSystemTools::KeyWOW64_32) &&
           cmSystemTools::PathExists(dir)) {
           cmSystemTools::PathExists(dir)) {
-        found = version[i].GeneratorName;
+        found = vsGenerators[i].GeneratorName;
         break;
         break;
       }
       }
     }
     }