[Cmake-commits] CMake branch, next, updated. v2.8.4-1872-ge9e38ac

[Bill Hoffman]

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  e9e38acbb3f7b7e062aaee2a8a46ac488fd32cdc (commit)
       via  6c72d25aee92c6cd412c79969b7b18a814ac99cb (commit)
      from  b1e2ef19de67458a70f49b62bbe3b8580bccffce (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=e9e38acbb3f7b7e062aaee2a8a46ac488fd32cdc
commit e9e38acbb3f7b7e062aaee2a8a46ac488fd32cdc
Merge: b1e2ef1 6c72d25
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jul 12 16:15:03 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 12 16:15:03 2011 -0400

    Merge topic 'intel_fortran_vs2010' into next
    
    6c72d25 Initial support for Intel Fortran VS2010.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c72d25aee92c6cd412c79969b7b18a814ac99cb
commit 6c72d25aee92c6cd412c79969b7b18a814ac99cb
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jul 8 17:08:43 2011 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Jul 8 17:08:43 2011 -0400

    Initial support for Intel Fortran VS2010.

diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 1850c16..ef378f9 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -93,10 +93,18 @@ void cmLocalVisualStudio10Generator::Generate()
 
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
     {
-    cmVisualStudio10TargetGenerator tg(
-      &l->second, static_cast<cmGlobalVisualStudio10Generator*>(
-        this->GetGlobalGenerator()));
-    tg.Generate();
+    if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
+       ->TargetIsFortranOnly(l->second))
+      {
+      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      }
+    else
+      {
+      cmVisualStudio10TargetGenerator tg(
+        &l->second, static_cast<cmGlobalVisualStudio10Generator*>(
+          this->GetGlobalGenerator()));
+      tg.Generate();
+      }
     }
   this->WriteStampFiles();
 }
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 160e2d4..8f7c7eb 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -75,6 +75,8 @@ public:
 
   virtual void ReadAndStoreExternalGUID(const char* name,
                                         const char* path);
+protected:
+  void CreateSingleVCProj(const char *lname, cmTarget &tgt);
 private:
   typedef cmVisualStudioGeneratorOptions Options;
   typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@@ -85,7 +87,6 @@ private:
   void WriteVCProjHeader(std::ostream& fout, const char *libName,
                          cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
   void WriteVCProjFooter(std::ostream& fout);
-  void CreateSingleVCProj(const char *lname, cmTarget &tgt);
   void WriteVCProjFile(std::ostream& fout, const char *libName, 
                        cmTarget &tgt);
   void WriteConfigurations(std::ostream& fout,

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

Summary of changes:
 Source/cmLocalVisualStudio10Generator.cxx |   16 ++++++++++++----
 Source/cmLocalVisualStudio7Generator.h    |    3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake