kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'vs-version-ivar' 

6571f46 Fix Intel Fortran .vfproj files for VS 10
This commit is contained in:
David Cole 2011-12-16 10:14:25 -05:00 committed by CMake Topic Stage
parent ac9453c371 6571f4655a
commit 037616f194
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -223,6 +223,14 @@ void cmLocalVisualStudio7Generator
this->FortranProject = this->FortranProject =
static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator) static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
->TargetIsFortranOnly(target); ->TargetIsFortranOnly(target);
// Intel Fortran for VS10 uses VS9 format ".vfproj" files.
VSVersion realVersion = this->Version;
if(this->FortranProject && this->Version >= VS10)
{
this->Version = VS9;
}
// add to the list of projects // add to the list of projects
std::string pname = lname; std::string pname = lname;
target.SetProperty("GENERATOR_FILE_NAME",lname); target.SetProperty("GENERATOR_FILE_NAME",lname);
@ -250,6 +258,8 @@ void cmLocalVisualStudio7Generator
{ {
this->GlobalGenerator->FileReplacedDuringGenerate(fname); this->GlobalGenerator->FileReplacedDuringGenerate(fname);
} }
this->Version = realVersion;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------