philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r27859] Merged revisions

Browse Source 
27625, 27627, 27647, 27648, 27661, 27668, 27670, 27671, 27674, 27676,
27703, 27716, 27720, 27747, 27754, 27755

from the trunk.

Mostly CMake and Fortran changes.

Tested on: jam (w/ gcc/gfortran 4.9.3)
This commit is contained in:
Dana Robinson
2015-09-22 15:44:16 -05:00
parent a2f7a8f34b
commit 8a170f1c61
93 changed files with 1133 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/cmake_ext_mod/HDFUseFortran.cmake
View File

@@ -3,7 +3,7 @@
#
#-------------------------------------------------------------------------------
ENABLE_LANGUAGE (Fortran)
#-----------------------------------------------------------------------------
# Detect name mangling convention used between Fortran and C
#-----------------------------------------------------------------------------
@@ -12,7 +12,6 @@ FortranCInterface_HEADER (
${CMAKE_BINARY_DIR}/FCMangle.h
MACRO_NAMESPACE "H5_FC_"
SYMBOL_NAMESPACE "H5_FC_"
SYMBOLS mysub mymod:my_sub
)
file (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)")
@@ -161,7 +160,7 @@ CHECK_FORTRAN_FEATURE(iso_c_binding
IMPLICIT NONE
TYPE(C_PTR) :: ptr
TYPE(C_FUNPTR) :: funptr
INTEGER(C_INT64_T) :: c_int64_type
INTEGER(C_INT64_T) :: c_int64_type
CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr
ptr = C_LOC(ichr(1:1))
END PROGRAM