[Cmake-commits] CMake branch, next, updated. v2.8.6-2347-g81684db

[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  81684db9c945fdf3abe72508ad5e746d8f52adb4 (commit)
       via  35a58387794a42b96b6055205c59cde774cab3df (commit)
      from  2599b8f397aae56cd6700aa991d747a929cd3167 (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=81684db9c945fdf3abe72508ad5e746d8f52adb4
commit 81684db9c945fdf3abe72508ad5e746d8f52adb4
Merge: 2599b8f 35a5838
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 2 13:57:32 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 2 13:57:32 2012 -0500

    Merge topic 'Windows-Intel-Fortran-flags-issue-12642' into next
    
    35a5838 Intel: Fix Windows per-config Fortran flags (#12642)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35a58387794a42b96b6055205c59cde774cab3df
commit 35a58387794a42b96b6055205c59cde774cab3df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 2 13:52:57 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 2 13:56:33 2012 -0500

    Intel: Fix Windows per-config Fortran flags (#12642)
    
    Fix typo introduced in commit 66a08c10 (more uniform approach to enable
    language, 2004-08-26).  The optimization option should be /O2 for
    Release configurations and /O1 for MinSizeRel.
    
    Suggested-by: He Yuqi <yuqi.he at gmail.com>

diff --git a/Modules/Platform/Windows-Intel-Fortran.cmake b/Modules/Platform/Windows-Intel-Fortran.cmake
index c959287..5c016a8 100644
--- a/Modules/Platform/Windows-Intel-Fortran.cmake
+++ b/Modules/Platform/Windows-Intel-Fortran.cmake
@@ -6,6 +6,6 @@ set(CMAKE_Fortran_STANDARD_LIBRARIES_INIT "user32.lib")
 __windows_compiler_intel(Fortran)
 SET (CMAKE_Fortran_FLAGS_INIT "/W1 /nologo /fpp /libs:dll /threads")
 SET (CMAKE_Fortran_FLAGS_DEBUG_INIT "/debug:full /dbglibs")
-SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "/O2 /D NDEBUG")
-SET (CMAKE_Fortran_FLAGS_RELEASE_INIT "/O1 /D NDEBUG")
-SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "/O1 /debug:full /D NDEBUG")
+SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "/O1 /D NDEBUG")
+SET (CMAKE_Fortran_FLAGS_RELEASE_INIT "/O2 /D NDEBUG")
+SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "/O2 /debug:full /D NDEBUG")

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

Summary of changes:
 Modules/Platform/Windows-Intel-Fortran.cmake |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake