[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-1017-g588d9a8

[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  588d9a8dc2ddf3780641ebec95b6cae15004eaca (commit)
       via  80d75246d475865210aa5bc09e0824b230cd074d (commit)
      from  7f6c8331d132568f41e9593cb12d2c7e5d8c5324 (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=588d9a8dc2ddf3780641ebec95b6cae15004eaca
commit 588d9a8dc2ddf3780641ebec95b6cae15004eaca
Merge: 7f6c833 80d7524
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 13 10:00:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 13 10:00:16 2015 -0400

    Merge topic 'factor-out-common-generator' into next
    
    80d75246 cmNinjaTargetGenerator: Restore addition of Fortran format flags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80d75246d475865210aa5bc09e0824b230cd074d
commit 80d75246d475865210aa5bc09e0824b230cd074d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 10 09:04:58 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 13 09:54:33 2015 -0400

    cmNinjaTargetGenerator: Restore addition of Fortran format flags
    
    Restore call to AppendFortranFormatFlags accidentally dropped by
    commit 0837538e (cmCommonTargetGenerator: Adopt GetFlags method,
    2015-07-09).  It was added originally by commit 6a56740e
    (cmNinjaTargetGenerator: Add Fortran flag generation, 2015-07-09).

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index a72bc72..43b9139 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -112,6 +112,12 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile const* source,
 {
   std::string flags = this->GetFlags(language);
 
+  // Add Fortran format flags.
+  if(language == "Fortran")
+    {
+    this->AppendFortranFormatFlags(flags, *source);
+    }
+
   // Add source file specific flags.
   this->LocalGenerator->AppendFlags(flags,
     source->GetProperty("COMPILE_FLAGS"));

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake