[Cmake-commits] CMake branch, next, updated. v2.8.12-4447-g622faf9

[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  622faf99d0cab33bd607e23f96b5faedc812970c (commit)
       via  f61bcbce1a70dbe47d59e77a1612ebe22ed76ffa (commit)
      from  467da8376e1b29a9561a37c44224ab11b0ccec7f (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=622faf99d0cab33bd607e23f96b5faedc812970c
commit 622faf99d0cab33bd607e23f96b5faedc812970c
Merge: 467da83 f61bcbc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 24 09:34:06 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 24 09:34:06 2013 -0400

    Merge topic 'intel-no-i_dynamic' into next
    
    f61bcbc Intel: Drop deprecated -i_dynamic flag from Fortran (#14507)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f61bcbce1a70dbe47d59e77a1612ebe22ed76ffa
commit f61bcbce1a70dbe47d59e77a1612ebe22ed76ffa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 24 09:28:46 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 24 09:29:43 2013 -0400

    Intel: Drop deprecated -i_dynamic flag from Fortran (#14507)
    
    The -i_dynamic flag is deprecated and not even listed in the manual for
    Intel Composer XE 2013.
    
    Reported-by: Izaak Beekman <zbeekman at gmail.com>

diff --git a/Modules/Platform/Linux-Intel-Fortran.cmake b/Modules/Platform/Linux-Intel-Fortran.cmake
index bb671ee..0c9523c 100644
--- a/Modules/Platform/Linux-Intel-Fortran.cmake
+++ b/Modules/Platform/Linux-Intel-Fortran.cmake
@@ -1,4 +1,4 @@
 include(Platform/Linux-Intel)
 __linux_compiler_intel(Fortran)
-set(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS} -i_dynamic -nofor_main")
-set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
+set(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS} -nofor_main")
+set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "")

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

Summary of changes:
 Modules/Platform/Linux-Intel-Fortran.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake