[Cmake-commits] CMake branch, master, updated. 0457d5315166892d6975ddf9829db7ecffb0499c

[cmake-commits at cmake.org]

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  0457d5315166892d6975ddf9829db7ecffb0499c (commit)
      from  7883f952b06e378eef7662a42a8c466cbe5aa285 (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=0457d5315166892d6975ddf9829db7ecffb0499c
commit 0457d5315166892d6975ddf9829db7ecffb0499c
Author: Brad King <brad.king at kitware.com>
Date:   Wed May 5 17:42:11 2010 -0400

    Use Fortran ABI detection results conservatively
    
    We set CMAKE_Fortran_SIZEOF_DATA_PTR in the Fortran compiler information
    file after detecting the compiler ABI.  However, since Fortran does not
    really have pointers, the preprocessor-based detection is unreliable.
    The result is needed to set CMAKE_SIZEOF_VOID_P only for Fortran-only
    projects because the value can come from C or C++ compilers otherwise.
    Therefore when CMAKE_SIZEOF_VOID_P is available from another language we
    should defer to it.

diff --git a/Modules/CMakeFortranCompiler.cmake.in b/Modules/CMakeFortranCompiler.cmake.in
index ba2b46d..5558651 100644
--- a/Modules/CMakeFortranCompiler.cmake.in
+++ b/Modules/CMakeFortranCompiler.cmake.in
@@ -34,9 +34,9 @@ ENDIF(UNIX)
 SET(CMAKE_Fortran_SIZEOF_DATA_PTR "@CMAKE_Fortran_SIZEOF_DATA_PTR@")
 SET(CMAKE_Fortran_COMPILER_ABI "@CMAKE_Fortran_COMPILER_ABI@")
 
-IF(CMAKE_Fortran_SIZEOF_DATA_PTR)
+IF(CMAKE_Fortran_SIZEOF_DATA_PTR AND NOT CMAKE_SIZEOF_VOID_P)
   SET(CMAKE_SIZEOF_VOID_P "${CMAKE_Fortran_SIZEOF_DATA_PTR}")
-ENDIF(CMAKE_Fortran_SIZEOF_DATA_PTR)
+ENDIF()
 
 IF(CMAKE_Fortran_COMPILER_ABI)
   SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_Fortran_COMPILER_ABI}")

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

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


hooks/post-receive
-- 
CMake