mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Restore support for Intel Fortran projects

Browse Source 
Refactoring in commit 3882718872 (VS: Decouple solution generation from
`.sln` file format, 2025-09-15, v4.2.0-rc1~154^2~3) accidentally dropped
Fortran targets from the generated VS Solution.

Fixes: #27346
This commit is contained in:
Brad King
2025-10-29 11:51:59 -04:00
parent d98c9bf2cc
commit 6ebf21a360
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalVisualStudioGenerator.cxx
View File

@@ -988,9 +988,7 @@ cm::VS::Solution cmGlobalVisualStudioGenerator::CreateSolution(
continue;
}
cmValue vcprojName = gt->GetProperty("GENERATOR_FILE_NAME");
cmValue vcprojType = gt->GetProperty("GENERATOR_FILE_NAME_EXT");
if (vcprojName && vcprojType) {
if (cmValue vcprojName = gt->GetProperty("GENERATOR_FILE_NAME")) {
cmLocalGenerator* lg = gt->GetLocalGenerator();
std::string dir =
root->MaybeRelativeToCurBinDir(lg->GetCurrentBinaryDirectory());
@@ -1000,14 +998,21 @@ cm::VS::Solution cmGlobalVisualStudioGenerator::CreateSolution(
dir += "/";
}
project->Path = cmStrCat(dir, *vcprojName, *vcprojType);
cm::string_view vcprojExt;
if (this->TargetIsFortranOnly(gt)) {
vcprojExt = ".vfproj"_s;
project->TypeId = Solution::Project::TypeIdFortran;
} else if (gt->IsCSharpOnly()) {
vcprojExt = ".csproj"_s;
project->TypeId = Solution::Project::TypeIdCSharp;
} else {
vcprojExt = ".vcproj"_s;
project->TypeId = Solution::Project::TypeIdDefault;
}
if (cmValue genExt = gt->GetProperty("GENERATOR_FILE_NAME_EXT")) {
vcprojExt = *genExt;
}
project->Path = cmStrCat(dir, *vcprojName, vcprojExt);
if (gt->IsDotNetSdkTarget() &&
!cmGlobalVisualStudioGenerator::IsReservedTarget(gt->GetName())) {