diff options
| author | Brad King <brad.king@kitware.com> | 2011-12-13 21:19:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-12-13 21:35:35 (GMT) |
| commit | 6571f4655a4e86986ca30215f46e6867c0ff7b92 (patch) | |
| tree | 7ccae6d03b8c13b8193a737d44a837b58425ee49 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | c92ffece804cd177c3531e58a39c3f0a6487d67d (diff) | |
| download | CMake-6571f4655a4e86986ca30215f46e6867c0ff7b92.zip CMake-6571f4655a4e86986ca30215f46e6867c0ff7b92.tar.gz CMake-6571f4655a4e86986ca30215f46e6867c0ff7b92.tar.bz2 | |
Fix Intel Fortran .vfproj files for VS 10
Commit 1be4b6f4 (Order VS local generator Version ivar values
consistently, 2011-11-10) fixed the Version ivar of the VS 10 local
generator by setting it correctly to 10 instead of leaving it at 7.
This broke generation of .vfproj files for the Intel Fortran plugin to
VS 10 by mixing VS 9 and 10 formats together in one file. Teach the
local generator to pretend the Version is 9 for Intel Fortran targets.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 8185b95..11a0387 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -223,6 +223,14 @@ void cmLocalVisualStudio7Generator this->FortranProject = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator) ->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 std::string pname = lname; target.SetProperty("GENERATOR_FILE_NAME",lname); @@ -250,6 +258,8 @@ void cmLocalVisualStudio7Generator { this->GlobalGenerator->FileReplacedDuringGenerate(fname); } + + this->Version = realVersion; } //---------------------------------------------------------------------------- |