[Cmake-commits] CMake branch, next, updated. v2.8.5-1777-gd473d1e

[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  d473d1eb3f111bd83f98d31e1cfc62ca8a19639c (commit)
       via  90efed6ee60fde3a1211672854f7e23affa8b983 (commit)
      from  3e6e82e9d89d1062ece2f1ea1432246ff8410660 (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=d473d1eb3f111bd83f98d31e1cfc62ca8a19639c
commit d473d1eb3f111bd83f98d31e1cfc62ca8a19639c
Merge: 3e6e82e 90efed6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 10:56:40 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 10:56:40 2011 -0400

    Merge topic 'fortran-format' into next
    
    90efed6 Xcode: Honor Fortran_FORMAT target and source file property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90efed6ee60fde3a1211672854f7e23affa8b983
commit 90efed6ee60fde3a1211672854f7e23affa8b983
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 10:52:51 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 1 10:54:12 2011 -0400

    Xcode: Honor Fortran_FORMAT target and source file property
    
    Convert the target property to the IFORT_LANG_SRCFMT build setting.
    Convert the source property to the per-source COMPILER_FLAGS setting.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index f67b029..2821827 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -582,6 +582,13 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
     {
     lg->AppendFlags(flags, cmtarget.GetProperty("COMPILE_FLAGS"));
     }
+  const char* srcfmt = sf->GetProperty("Fortran_FORMAT");
+  switch(this->CurrentLocalGenerator->GetFortranFormat(srcfmt))
+    {
+    case cmLocalGenerator::FortranFormatFixed: flags="-fixed "+flags; break;
+    case cmLocalGenerator::FortranFormatFree: flags="-free "+flags; break;
+    default: break;
+    }
   lg->AppendFlags(flags, sf->GetProperty("COMPILE_FLAGS"));
 
   // Add per-source definitions.
@@ -1903,6 +1910,21 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                 this->CreateString(flags.c_str()));
     }
 
+  // Add Fortran source format attribute if property is set.
+  const char* format = 0;
+  const char* tgtfmt = target.GetProperty("Fortran_FORMAT");
+  switch(this->CurrentLocalGenerator->GetFortranFormat(tgtfmt))
+    {
+    case cmLocalGenerator::FortranFormatFixed: format = "fixed"; break;
+    case cmLocalGenerator::FortranFormatFree: format = "free"; break;
+    default: break;
+    }
+  if(format)
+    {
+    buildSettings->AddAttribute("IFORT_LANG_SRCFMT",
+                                this->CreateString(format));
+    }
+
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
   if(target.GetType() == cmTarget::SHARED_LIBRARY)

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

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


hooks/post-receive
-- 
CMake