[Cmake-commits] CMake branch, next, updated. v2.8.6-2194-g794eb2c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  794eb2c9b43c40df4a1c53a30f4d995b49b886c5 (commit)
       via  6571f4655a4e86986ca30215f46e6867c0ff7b92 (commit)
      from  f8dc56c6da2668dbe98077412d76a155e823e167 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=794eb2c9b43c40df4a1c53a30f4d995b49b886c5
commit 794eb2c9b43c40df4a1c53a30f4d995b49b886c5
Merge: f8dc56c 6571f46
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 16:36:16 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 13 16:36:16 2011 -0500

    Merge topic 'vs-version-ivar' into next
    
    6571f46 Fix Intel Fortran .vfproj files for VS 10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6571f4655a4e86986ca30215f46e6867c0ff7b92
commit 6571f4655a4e86986ca30215f46e6867c0ff7b92
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 16:19:14 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 13 16:35:35 2011 -0500

    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.

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;
 }
 
 //----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake