mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update macros

Browse Source
This commit is contained in:
Allen Byrne 2017-11-27 13:06:10 -06:00 committed by M. Scot Breitenfeld
parent 796cc17f41
commit 04f22540e2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/cmake_ext_mod/HDFMacros.cmake
View File

@ -108,6 +108,7 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
set_target_properties (${libtarget}
PROPERTIES
OUTPUT_NAME ${LIB_RELEASE_NAME}
OUTPUT_NAME_DEBUG ${LIB_DEBUG_NAME}
OUTPUT_NAME_RELEASE ${LIB_RELEASE_NAME}
OUTPUT_NAME_MINSIZEREL ${LIB_RELEASE_NAME}

4
fortran/src/H5f90global.F90
View File

@ -83,7 +83,8 @@ MODULE H5GLOBAL
INTEGER, PARAMETER :: INTEGER_TYPES_LEN = 27
! These arrays need to be global because they are used in
! both h5open_f and in h5close_f
! both h5open_f and in h5close_f; initialize to fix linking issues
! on OSX and Intel compilers.
INTEGER(HID_T), DIMENSION(1:PREDEF_TYPES_LEN) :: predef_types = -1
INTEGER(HID_T), DIMENSION(1:FLOATING_TYPES_LEN) :: floating_types = -1
INTEGER(HID_T), DIMENSION(1:INTEGER_TYPES_LEN) :: integer_types = -1
@ -437,7 +438,6 @@ MODULE H5GLOBAL
INTEGER :: H5_SZIP_EC_OM_F
INTEGER :: H5_SZIP_NN_OM_F
CONTAINS
! Copy a c string to a Fortran string