[Cmake-commits] CMake branch, next, updated. v3.2.0-925-g814dafa

[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  814dafa67b9505e7d8816a2443277c9de95c5460 (commit)
       via  7fde97947770258cd175756c315cbd07295bdb97 (commit)
      from  a4f71ff435624bbccb41f912a2d7470e3c35456d (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=814dafa67b9505e7d8816a2443277c9de95c5460
commit 814dafa67b9505e7d8816a2443277c9de95c5460
Merge: a4f71ff 7fde979
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 9 10:39:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 9 10:39:28 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fde97947770258cd175756c315cbd07295bdb97
commit 7fde97947770258cd175756c315cbd07295bdb97
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: Mon Mar 9 10:17: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..3efe7ba 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"},
+  {"FloatingPointExceptionHandling", "fpe:1", "", "fpe1"},
+  {"FloatingPointExceptionHandling", "fpe:3", "", "fpe3"},
 
   {"ModulePath", "module:", "", "",
    cmVS7FlagTable::UserValueRequired},

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

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


hooks/post-receive
-- 
CMake