[Cmake-commits] CMake branch, next, updated. v3.2.0-938-ga173921

[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  a173921342439ec3e2073b0752265c22078134fb (commit)
       via  30319c4ef8f1de651b1ceee5dc6ae2bec0b3dfb2 (commit)
      from  95105b9e140a74048d0bcd015e92c8ddc6593a61 (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=a173921342439ec3e2073b0752265c22078134fb
commit a173921342439ec3e2073b0752265c22078134fb
Merge: 95105b9 30319c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 08:39:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 10 08:39:57 2015 -0400

    Merge topic 'vs-Intel-Fortran-map-more-flags' into next
    
    30319c4e fixup! VS: Add more Fortran compiler flags to flag table (#15381)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30319c4ef8f1de651b1ceee5dc6ae2bec0b3dfb2
commit 30319c4ef8f1de651b1ceee5dc6ae2bec0b3dfb2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 08:39:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 10 08:39:34 2015 -0400

    fixup! VS: Add more Fortran compiler flags to flag table (#15381)

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 3efe7ba..25d80f2 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -395,9 +395,9 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFortranFlagTable[] =
   {"OpenMP", "Qopenmp-stubs", "", "OpenMPSequentialCode", 0},
   {"Traceback", "traceback", "", "true", 0},
   {"Traceback", "notraceback", "", "false", 0},
-  {"FloatingPointExceptionHandling", "fpe:0", "", "fpe0"},
-  {"FloatingPointExceptionHandling", "fpe:1", "", "fpe1"},
-  {"FloatingPointExceptionHandling", "fpe:3", "", "fpe3"},
+  {"FloatingPointExceptionHandling", "fpe:0", "", "fpe0", 0},
+  {"FloatingPointExceptionHandling", "fpe:1", "", "fpe1", 0},
+  {"FloatingPointExceptionHandling", "fpe:3", "", "fpe3", 0},
 
   {"ModulePath", "module:", "", "",
    cmVS7FlagTable::UserValueRequired},

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake