[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6083-g282b19d

[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  282b19d8738c7591f727a4f3d24320c0c3a83c1b (commit)
       via  5da1580adaa0b7ccf5f3a6afac5e9cae615ca163 (commit)
       via  ce598cc838c717132a122a97c5e21b99f11fe23b (commit)
      from  9dfac4695e4d83b19af0169e775b8b401adc0503 (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=282b19d8738c7591f727a4f3d24320c0c3a83c1b
commit 282b19d8738c7591f727a4f3d24320c0c3a83c1b
Merge: 9dfac46 5da1580
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 6 09:07:36 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 6 09:07:36 2013 -0500

    Merge topic 'mingw-gfortran-sizeof-dptr' into next
    
    5da1580 Fortran: Improve pointer size detection in gfortran on MinGW
    ce598cc CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5da1580adaa0b7ccf5f3a6afac5e9cae615ca163
commit 5da1580adaa0b7ccf5f3a6afac5e9cae615ca163
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 6 09:01:32 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 6 09:02:27 2013 -0500

    Fortran: Improve pointer size detection in gfortran on MinGW
    
    In commit ecd84147 (Fortran: Detect pointer size in gfortran on MinGW,
    2011-11-29) we started testing for __SIZEOF_POINTER__ but not all GNU
    Fortran compilers define this.  Check also for __SIZEOF_SIZE_T__ which
    at least one version of gfortran defines without also defining
    __SIZEOF_POINTER__.

diff --git a/Modules/CMakeFortranCompilerABI.F b/Modules/CMakeFortranCompilerABI.F
index 7e24553..21ca7ff 100644
--- a/Modules/CMakeFortranCompilerABI.F
+++ b/Modules/CMakeFortranCompilerABI.F
@@ -20,6 +20,10 @@
         PRINT *, 'INFO:sizeof_dptr[8]'
 #elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 4
         PRINT *, 'INFO:sizeof_dptr[4]'
+#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 8
+        PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 4
+        PRINT *, 'INFO:sizeof_dptr[4]'
 #endif
 
 #if 0

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

Summary of changes:
 Modules/CMakeFortranCompilerABI.F |    4 ++++
 Source/CMakeVersion.cmake         |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake