Răsfoiți Sursa

VS: Add include_external_msproject detection of `.njsproj` type

It is a NodeJS Project.
Brad King 2 zile în urmă
părinte
comite
ab2ef244bd

+ 3 - 0
Source/cmGlobalVisualStudioGenerator.cxx

@@ -798,6 +798,9 @@ cm::string_view cmGlobalVisualStudioGenerator::ExternalProjectTypeId(
   if (extension == ".dbproj"_s) {
     return Solution::Project::TypeIdDatabase;
   }
+  if (extension == ".njsproj"_s) {
+    return Solution::Project::TypeIdNodeJS;
+  }
   if (extension == ".wapproj"_s) {
     return Solution::Project::TypeIdWinAppPkg;
   }

+ 2 - 0
Source/cmVSSolution.cxx

@@ -27,6 +27,8 @@ cm::string_view const Solution::Project::TypeIdFSharp =
   "F2A71F9B-5D33-465A-A702-920D77279786"_s;
 cm::string_view const Solution::Project::TypeIdFortran =
   "6989167D-11E4-40FE-8C1A-2192A86A7E90"_s;
+cm::string_view const Solution::Project::TypeIdNodeJS =
+  "9092AA53-FB77-4645-B42D-1CCCA6BD08BD"_s;
 cm::string_view const Solution::Project::TypeIdPython =
   "888888A0-9F3D-457C-B088-3A5042F75D52"_s;
 cm::string_view const Solution::Project::TypeIdVDProj =

+ 1 - 0
Source/cmVSSolution.h

@@ -75,6 +75,7 @@ struct Solution final
     static cm::string_view const TypeIdDefault;
     static cm::string_view const TypeIdFSharp;
     static cm::string_view const TypeIdFortran;
+    static cm::string_view const TypeIdNodeJS;
     static cm::string_view const TypeIdPython;
     static cm::string_view const TypeIdVDProj;
     static cm::string_view const TypeIdVisualBasic;

+ 1 - 0
Tests/RunCMake/include_external_msproject/AutoType-check-sln.cmake

@@ -1,6 +1,7 @@
 check_project(AutoType externalCS  "" "FAE04EC0-301F-11D3-BF4B-00C04F79EFBC" "" "")
 check_project(AutoType externalDB  "" "C8D11400-126E-41CD-887F-60BD40844F9E" "" "")
 check_project(AutoType externalFS  "" "F2A71F9B-5D33-465A-A702-920D77279786" "" "")
+check_project(AutoType externalNJS "" "9092AA53-FB77-4645-B42D-1CCCA6BD08BD" "" "")
 check_project(AutoType externalPy  "" "888888A0-9F3D-457C-B088-3A5042F75D52" "" "")
 check_project(AutoType externalVB  "" "F184B08F-C81C-45F6-A57F-5ABD9991F28F" "" "")
 check_project(AutoType externalVD  "" "54435603-DBB4-11D2-8724-00A0C9A8B90C" "" "")

+ 4 - 0
Tests/RunCMake/include_external_msproject/AutoType-check-slnx.cmake

@@ -13,6 +13,7 @@ RunCMake_check_slnx("${RunCMake_TEST_BINARY_DIR}/AutoType.slnx" [[
     <BuildDependency Project="external\.csproj"/>
     <BuildDependency Project="external\.dbproj"/>
     <BuildDependency Project="external\.fsproj"/>
+    <BuildDependency Project="external\.njsproj"/>
     <BuildDependency Project="external\.pyproj"/>
     <BuildDependency Project="external\.vbproj"/>
     <BuildDependency Project="external\.vdproj"/>
@@ -35,6 +36,9 @@ RunCMake_check_slnx("${RunCMake_TEST_BINARY_DIR}/AutoType.slnx" [[
   <Project Path="external\.fsproj" Type="f2a71f9b-5d33-465a-a702-920d77279786" Id="[0-9a-f-]+">
     <BuildDependency Project="ZERO_CHECK.vcxproj"/>
   </Project>
+  <Project Path="external\.njsproj" Type="9092aa53-fb77-4645-b42d-1ccca6bd08bd" Id="[0-9a-f-]+">
+    <BuildDependency Project="ZERO_CHECK.vcxproj"/>
+  </Project>
   <Project Path="external\.pyproj" Type="888888a0-9f3d-457c-b088-3a5042f75d52" Id="[0-9a-f-]+">
     <BuildDependency Project="ZERO_CHECK.vcxproj"/>
   </Project>

+ 1 - 0
Tests/RunCMake/include_external_msproject/AutoType.cmake

@@ -2,6 +2,7 @@ include_external_msproject(externalCS  external.csproj)
 include_external_msproject(externalDB  external.dbproj)
 include_external_msproject(externalFS  external.fsproj)
 include_external_msproject(externalPy  external.pyproj)
+include_external_msproject(externalNJS external.njsproj)
 include_external_msproject(externalVB  external.vbproj)
 include_external_msproject(externalVD  external.vdproj)
 include_external_msproject(externalVF  external.vfproj)