[Cmake-commits] CMake branch, master, updated. v2.8.4-48-g6e450ed

[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, master has been updated
       via  6e450ed7f05e98216bc4ddd9f2c82149603de964 (commit)
       via  93f230e408cba124dc5ba97b1ef7f228ccb4fcc9 (commit)
      from  a38c1b3584e3009d525caa656798ab8b1dd5e9f8 (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=6e450ed7f05e98216bc4ddd9f2c82149603de964
commit 6e450ed7f05e98216bc4ddd9f2c82149603de964
Merge: a38c1b3 93f230e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 22 14:31:40 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 22 14:31:40 2011 -0500

    Merge topic 'mpif77-workaround-o-c-order'
    
    93f230e Pass -o after -c for Fortran to avoid mpif77 ordering bug

diff --cc Modules/CMakeFortranInformation.cmake
index 4f033e3,80f5e46..dc15e55
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@@ -167,20 -163,15 +167,21 @@@ ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_M
  
  # Create a static archive incrementally for large object file counts.
  # If CMAKE_Fortran_CREATE_STATIC_LIBRARY is set it will override these.
 -SET(CMAKE_Fortran_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
 -SET(CMAKE_Fortran_ARCHIVE_APPEND "<CMAKE_AR> r  <TARGET> <LINK_FLAGS> <OBJECTS>")
 -SET(CMAKE_Fortran_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 +IF(NOT DEFINED CMAKE_Fortran_ARCHIVE_CREATE)
 +  SET(CMAKE_Fortran_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
 +ENDIF()
 +IF(NOT DEFINED CMAKE_Fortran_ARCHIVE_APPEND)
 +  SET(CMAKE_Fortran_ARCHIVE_APPEND "<CMAKE_AR> r  <TARGET> <LINK_FLAGS> <OBJECTS>")
 +ENDIF()
 +IF(NOT DEFINED CMAKE_Fortran_ARCHIVE_FINISH)
 +  SET(CMAKE_Fortran_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 +ENDIF()
  
  # compile a Fortran file into an object file
+ # (put -o after -c to workaround bug in at least one mpif77 wrapper)
  IF(NOT CMAKE_Fortran_COMPILE_OBJECT)
    SET(CMAKE_Fortran_COMPILE_OBJECT
-     "<CMAKE_Fortran_COMPILER> -o <OBJECT> <DEFINES> <FLAGS> -c <SOURCE>")
+     "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -c <SOURCE> -o <OBJECT>")
  ENDIF(NOT CMAKE_Fortran_COMPILE_OBJECT)
  
  # link a fortran program

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

Summary of changes:
 Modules/CMakeFortranInformation.cmake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake