diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-11-27 19:06:10 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-11-29 16:27:00 (GMT) |
| commit | 04f22540e239103f468ed48c2349b8ffe8f3b476 (patch) | |
| tree | 6697897f0feab7b93878b162b18c9308ff78815c | |
| parent | 796cc17f414b35708ae51e06f75f5a7d0205881b (diff) | |
| download | hdf5-04f22540e239103f468ed48c2349b8ffe8f3b476.zip hdf5-04f22540e239103f468ed48c2349b8ffe8f3b476.tar.gz hdf5-04f22540e239103f468ed48c2349b8ffe8f3b476.tar.bz2 | |
Update macros
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 1 | ||||
| -rw-r--r-- | fortran/src/H5f90global.F90 | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 602b6bf..192a5c8 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -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} diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90 index d4a9008..4a04971 100644 --- a/fortran/src/H5f90global.F90 +++ b/fortran/src/H5f90global.F90 @@ -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 |