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 632bb1fc8d525e623f8cced1c077545b7c7e0ed6 (commit)
via eb8cb2c6c203418a23551ca85afa6292dededa81 (commit)
from 5a64771f606cea50399d7207d4ee698c6a585f90 (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=632bb1fc8d525e623f8cced1c077545b7c7e0ed6
commit 632bb1fc8d525e623f8cced1c077545b7c7e0ed6
Merge: 5a64771 eb8cb2c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Apr 10 12:57:06 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Apr 10 12:57:06 2014 -0400
Merge topic 'Fortran-pgi-intel-arch' into next
eb8cb2c6 Fortran: Detect pointer size on Intel archs with PGI (#14870)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb8cb2c6c203418a23551ca85afa6292dededa81
commit eb8cb2c6c203418a23551ca85afa6292dededa81
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Apr 10 12:55:22 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Apr 10 12:57:02 2014 -0400
Fortran: Detect pointer size on Intel archs with PGI (#14870)
The PGI compiler does not define __SIZEOF_POINTER__ so use the
__x86_64__ or __i386__ CPU macros to select a pointer size instead.
diff --git a/Modules/CMakeFortranCompilerABI.F
b/Modules/CMakeFortranCompilerABI.F
index 21ca7ff..b34c284 100644
--- a/Modules/CMakeFortranCompilerABI.F
+++ b/Modules/CMakeFortranCompilerABI.F
@@ -10,11 +10,15 @@
PRINT *, 'INFO:sizeof_dptr[8]'
#elif defined(_M_AMD64)
PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(__x86_64__)
+ PRINT *, 'INFO:sizeof_dptr[8]'
#elif defined(_ILP32)
PRINT *, 'INFO:sizeof_dptr[4]'
#elif defined(_M_IX86)
PRINT *, 'INFO:sizeof_dptr[4]'
+#elif defined(__i386__)
+ PRINT *, 'INFO:sizeof_dptr[4]'
#elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8
PRINT *, 'INFO:sizeof_dptr[8]'
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeFortranCompilerABI.F | 4 ++++
1 file changed, 4 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
