[Cmake-commits] CMake branch, next, updated. v3.2.2-3156-gf70d883

[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  f70d8830781b909e5171e41940fcc60248a60bf9 (commit)
       via  bd2ef44b55f39e253e52289b4f76596c7c9880eb (commit)
      from  7c11e23e8b6eabbcdf6f0829e0439c1ec07cf7cb (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=f70d8830781b909e5171e41940fcc60248a60bf9
commit f70d8830781b909e5171e41940fcc60248a60bf9
Merge: 7c11e23 bd2ef44
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 10:27:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 10:27:05 2015 -0400

    Merge topic 'intel-fortran-windows-debug' into next
    
    bd2ef44b Intel: Disable Fortran optimizations for Debug config on Windows (#15583)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd2ef44b55f39e253e52289b4f76596c7c9880eb
commit bd2ef44b55f39e253e52289b4f76596c7c9880eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 10:24:01 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 10:25:31 2015 -0400

    Intel: Disable Fortran optimizations for Debug config on Windows (#15583)
    
    The "/Od" flag is used for C and C++ languages in this configuration so
    we should use it for Fortran too.
    
    Suggested-by: Oleg V. Zhylin <ovz at yahoo.com>

diff --git a/Modules/Platform/Windows-Intel-Fortran.cmake b/Modules/Platform/Windows-Intel-Fortran.cmake
index 40523ff..0f9a10a 100644
--- a/Modules/Platform/Windows-Intel-Fortran.cmake
+++ b/Modules/Platform/Windows-Intel-Fortran.cmake
@@ -5,7 +5,7 @@ set(CMAKE_Fortran_MODDIR_FLAG "-module:")
 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_DEBUG_INIT "/Od /debug:full /dbglibs")
 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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake