diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-02-02 06:46:40 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-02-02 06:46:40 (GMT) |
| commit | cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9 (patch) | |
| tree | 9f39886657d25fd8bf621b8e1a769ad64dfb7534 /src | |
| parent | 45eefdbdea5aec34f67dabec64a5a1005483c095 (diff) | |
| parent | 67f41bf9f80499f1e1f6dc8e27a599ba0a4b9ef3 (diff) | |
| download | hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.zip hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.gz hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.bz2 | |
[svn-r26096] Merged r26024-26095 from trunk.
Tested on: jam with Fortran and C++
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/H5PL.c | 6 | ||||
| -rw-r--r-- | src/H5public.h | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2dc68c1..3ad51b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -901,7 +901,7 @@ endif (NOT HDF5_INSTALL_NO_DEVELOPMENT) #----------------------------------------------------------------------------- if (HDF5_EXPORTED_TARGETS) if (BUILD_SHARED_LIBS) - INSTALL_TARGET_PDB (${HDF5_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} libraries) + INSTALL_TARGET_PDB (${HDF5_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} libraries) endif (BUILD_SHARED_LIBS) install ( @@ -405,8 +405,14 @@ H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info) /* The library we are looking for should be called libxxx.so... on Unix * or libxxx.xxx.dylib on Mac. */ +#ifndef __CYGWIN__ if(!HDstrncmp(dp->d_name, "lib", (size_t)3) && (HDstrstr(dp->d_name, ".so") || HDstrstr(dp->d_name, ".dylib"))) { +#else + if(!HDstrncmp(dp->d_name, "cyg", (size_t)3) && + HDstrstr(dp->d_name, ".dll") ) { + +#endif h5_stat_t my_stat; size_t pathname_len; htri_t found_in_dir; diff --git a/src/H5public.h b/src/H5public.h index b4ec8a7..51fd0ee 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -94,10 +94,10 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 9 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 212 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_RELEASE 213 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.9.212" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.9.213" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/src/Makefile.in b/src/Makefile.in index c5a1c27..a15ed08 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -729,7 +729,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 202 +LT_VERS_REVISION = 203 LT_VERS_AGE = 0 # Our main target, the HDF5 library |