diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-16 15:14:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-16 15:14:25 (GMT) |
| commit | 037616f194f72b3563edd0c5b5c028694b2fcb50 (patch) | |
| tree | 86872e82cc5a1e7a7277a1fa3aa77426cc448718 | |
| parent | ac9453c371132d12d975385be8376af0f76d8078 (diff) | |
| parent | 6571f4655a4e86986ca30215f46e6867c0ff7b92 (diff) | |
| download | CMake-037616f194f72b3563edd0c5b5c028694b2fcb50.zip CMake-037616f194f72b3563edd0c5b5c028694b2fcb50.tar.gz CMake-037616f194f72b3563edd0c5b5c028694b2fcb50.tar.bz2 | |
Merge topic 'vs-version-ivar'
6571f46 Fix Intel Fortran .vfproj files for VS 10
| -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; } //---------------------------------------------------------------------------- |