[Cmake-commits] CMake branch, next, updated. v3.2.0-940-g8a48986

[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  8a48986c38539150ac5eeafa11fb584de68e1d85 (commit)
       via  18d5a4bcfd688687d334d645dfdaa7fd5a207bd9 (commit)
      from  a173921342439ec3e2073b0752265c22078134fb (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=8a48986c38539150ac5eeafa11fb584de68e1d85
commit 8a48986c38539150ac5eeafa11fb584de68e1d85
Merge: a173921 18d5a4b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 08:40:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 10 08:40:53 2015 -0400

    Merge topic 'vs-Intel-Fortran-map-more-flags' into next
    
    18d5a4bc VS: Add more Fortran compiler flags to flag table (#15381)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18d5a4bcfd688687d334d645dfdaa7fd5a207bd9
commit 18d5a4bcfd688687d334d645dfdaa7fd5a207bd9
Author:     Oyvind Jensen <oyvind.jensen at ife.no>
AuthorDate: Thu Mar 5 14:49:14 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 10 08:40:37 2015 -0400

    VS: Add more Fortran compiler flags to flag table (#15381)
    
    Due to a difference in how AdditionalOptions are implemented in the
    Fortran component of VS and the C/C++ component, flags that are not
    listed in the flag table are at risk of being overwritten.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index ed560aa..25d80f2 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -391,6 +391,13 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFortranFlagTable[] =
   {"OptimizeForProcessor", "QxT", "", "codeExclusivelyCore2Duo", 0},
   {"OptimizeForProcessor", "QxO", "", "codeExclusivelyCore2StreamingSIMD", 0},
   {"OptimizeForProcessor", "QxS", "", "codeExclusivelyCore2StreamingSIMD4", 0},
+  {"OpenMP", "Qopenmp", "", "OpenMPParallelCode", 0},
+  {"OpenMP", "Qopenmp-stubs", "", "OpenMPSequentialCode", 0},
+  {"Traceback", "traceback", "", "true", 0},
+  {"Traceback", "notraceback", "", "false", 0},
+  {"FloatingPointExceptionHandling", "fpe:0", "", "fpe0", 0},
+  {"FloatingPointExceptionHandling", "fpe:1", "", "fpe1", 0},
+  {"FloatingPointExceptionHandling", "fpe:3", "", "fpe3", 0},
 
   {"ModulePath", "module:", "", "",
    cmVS7FlagTable::UserValueRequired},

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

Summary of changes:


hooks/post-receive
-- 
CMake