summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-02-02 06:46:40 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-02-02 06:46:40 (GMT)
commitcd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9 (patch)
tree9f39886657d25fd8bf621b8e1a769ad64dfb7534
parent45eefdbdea5aec34f67dabec64a5a1005483c095 (diff)
parent67f41bf9f80499f1e1f6dc8e27a599ba0a4b9ef3 (diff)
downloadhdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.zip
hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.gz
hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.bz2
[svn-r26096] Merged r26024-26095 from trunk.
Tested on: jam with Fortran and C++
-rw-r--r--Makefile.in6
-rw-r--r--README.txt2
-rw-r--r--c++/src/CMakeLists.txt2
-rw-r--r--c++/src/Makefile.in2
-rw-r--r--config/lt_vers.am2
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac2
-rw-r--r--fortran/src/CMakeLists.txt4
-rw-r--r--fortran/src/Makefile.in2
-rw-r--r--hl/c++/src/CMakeLists.txt2
-rw-r--r--hl/c++/src/Makefile.in2
-rw-r--r--hl/fortran/src/CMakeLists.txt4
-rw-r--r--hl/fortran/src/Makefile.in2
-rw-r--r--hl/src/CMakeLists.txt2
-rw-r--r--hl/src/Makefile.in2
-rw-r--r--release_docs/INSTALL_parallel45
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/H5PL.c6
-rw-r--r--src/H5public.h4
-rw-r--r--src/Makefile.in2
-rw-r--r--test/CMakeTests.cmake4
-rw-r--r--test/test_plugin.sh.in12
-rw-r--r--tools/lib/CMakeLists.txt2
-rw-r--r--vms/src/h5pubconf.h6
25 files changed, 75 insertions, 68 deletions
diff --git a/Makefile.in b/Makefile.in
index 298add2..054022a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,9 +43,9 @@
# Configure should set AM_MAKEFLAGS to -V to solve this problem in
# subdirectories.
# NOTE: This means that invoking pmake in a subdirectory will not work.
-.MAKEFLAGS:@AM_MAKEFLAGS@
- $(MAKE) all
-
+#xxx.MAKEFLAGS:@AM_MAKEFLAGS@
+#xxx $(MAKE) all
+#xxx
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
diff --git a/README.txt b/README.txt
index a3e27d5..ce92f19 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.212 currently under development
+HDF5 version 1.9.213 currently under development
Please refer to the release_docs/INSTALL file for installation instructions.
------------------------------------------------------------------------------
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index b07ab2b..c0e2f11 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -110,7 +110,7 @@ install (
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} cpplibraries)
+ INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 688c13f..8ab5c24 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -679,7 +679,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
# This is our main target
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 27e6067..8acd54a 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -19,7 +19,7 @@
# 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
## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/configure b/configure
index 0fca1ad..a34ba2e 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.9.212.
+# Generated by GNU Autoconf 2.69 for HDF5 1.9.213.
#
# Report bugs to <help@hdfgroup.org>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HDF5'
PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.9.212'
-PACKAGE_STRING='HDF5 1.9.212'
+PACKAGE_VERSION='1.9.213'
+PACKAGE_STRING='HDF5 1.9.213'
PACKAGE_BUGREPORT='help@hdfgroup.org'
PACKAGE_URL=''
@@ -1482,7 +1482,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures HDF5 1.9.212 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.9.213 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1552,7 +1552,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of HDF5 1.9.212:";;
+ short | recursive ) echo "Configuration of HDF5 1.9.213:";;
esac
cat <<\_ACEOF
@@ -1744,7 +1744,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-HDF5 configure 1.9.212
+HDF5 configure 1.9.213
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2681,7 +2681,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by HDF5 $as_me 1.9.212, which was
+It was created by HDF5 $as_me 1.9.213, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3552,7 +3552,7 @@ fi
# Define the identity of the package.
PACKAGE='hdf5'
- VERSION='1.9.212'
+ VERSION='1.9.213'
cat >>confdefs.h <<_ACEOF
@@ -30548,7 +30548,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-HDF5 config.lt 1.9.212
+HDF5 config.lt 1.9.213
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -32690,7 +32690,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by HDF5 $as_me 1.9.212, which was
+This file was extended by HDF5 $as_me 1.9.213, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -32756,7 +32756,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-HDF5 config.status 1.9.212
+HDF5 config.status 1.9.213
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index b59b7b4..250fd67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
-AC_INIT([HDF5], [1.9.212], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.9.213], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADER([src/H5config.h])
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index b149017..5b641d1 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -374,8 +374,8 @@ endif (WIN32)
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
- #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
+ INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
+ #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 50134b7..c41f232 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -730,7 +730,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
AM_FCLIBS = $(LIBHDF5)
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 9776f06..03ef26d 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -41,7 +41,7 @@ install (
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries)
+ INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 76589e7..6cbd447 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -671,7 +671,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
# This is our main target
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index c5b2d57..ee8604e 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -109,8 +109,8 @@ endif (WIN32)
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
- #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
+ INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
+ #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 686a405..686c23f 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -686,7 +686,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 high-level fortran library
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index e3a72e4..9c9e3a9 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -60,7 +60,7 @@ install (
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hllibraries)
+ INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 92c4f3b..29ead86 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -667,7 +667,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
# This library is our main target.
diff --git a/release_docs/INSTALL_parallel b/release_docs/INSTALL_parallel
index 28068f1..2624b3b 100644
--- a/release_docs/INSTALL_parallel
+++ b/release_docs/INSTALL_parallel
@@ -191,7 +191,7 @@ echo SKIP TOOLTEST tgroup-1.ls 1 -w80 -r -g tgroup.h5
2.5.1 Building HDF5 for Hopper
------------------------------------------
The following steps are for building HDF5 for the Hopper compute
-nodes. They would probably work for other Cray XE6 systems but have
+nodes. They would probably work for other Cray systems but have
not been verified.
Obtain a copy from the HDF ftp server:
@@ -199,39 +199,32 @@ http://www.hdfgroup.org/ftp/HDF5/current/src/
(link might change, so always double check the HDF group website).
$ wget http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-x.x.x.tar.gz
-
unpack the tarball
-$ cd hdf5-x.x.x/
-$ CC=cc FC=ftn ./configure \
---prefix=/project/hdf5/hdf5 --enable-parallel --enable-fortran \
---disable-shared --disable-production
-$ make
+The entire build process should be done on a MOM node in an interactive allocation and on a file system accessible by all compute nodes.
+Request an interactive allocation with qsub:
+qsub -I -q debug -l mppwidth=8
-Run make check. make check should be run on the compute nodes, not the
-front end nodes. So using a PBS batch script, allocate 4 or more
-cores. Always consult with the machine's website on how to create PBS
-scripts and allocate nodes for your job. For Hopper, all the
-information can be found on:
-http://www.nersc.gov/systems/hopper-cray-xe6/
+- create a build directory build-hdf5:
+ mkdir build-hdf5; cd build-hdf5/
-save the PBS script into your HDF5 build directory. The PBS script
-should contain (besides the PBS node allocation requests)the
-following:
+- configure HDF5:
+ RUNSERIAL="aprun -q -n 1" RUNPARALLEL="aprun -q -n 6" FC=ftn CC=cc /path/to/source/configure --enable-fortran --enable-parallel --disable-shared
---------------------------------------------------------------
-cd $PBS_O_WORKDIR
+ RUNSERIAL and RUNPARALLEL tells the library how it should launch programs that are part of the build procedure.
-##set RUNSERIAL and RUNPARALLEL like this in the PBS script:
-export RUNPARALLEL="aprun -n 6"
-export RUNSERIAL="aprun -n 1"
+- Compile HDF5:
+ gmake
-##execute make check:
-make check
---------------------------------------------------------------
+- Check HDF5
+ gmake check
+
+- Install HDF5
+ gmake install
+
+The build will be in build-hdf5/hdf5/ (or whatever you specify in --prefix).
+To compile other HDF5 applications use the wrappers created by the build (build-hdf5/hdf5/bin/h5pcc or h5fc)
-Once the job runs and all is well, install the binary:
-$ make install
2.5.2 Hopper known issues
------------------------------
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 097685e..c26950b 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.212 currently under development
+HDF5 version 1.9.213 currently under development
================================================================================
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 (
diff --git a/src/H5PL.c b/src/H5PL.c
index 21bc0f2..738db90 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -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
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index f98ab67..1e497ae 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -7,8 +7,8 @@
# make test dir
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST")
-file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/tesfiles")
-file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/tesfiles/plist_files")
+file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/testfiles")
+file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files")
if (HDF5_TEST_VFD)
set (VFD_LIST
sec2
diff --git a/test/test_plugin.sh.in b/test/test_plugin.sh.in
index b268661..a6d8c50 100644
--- a/test/test_plugin.sh.in
+++ b/test/test_plugin.sh.in
@@ -28,8 +28,16 @@ exit_code=$EXIT_SUCCESS
TEST_NAME=plugin
TEST_BIN=`pwd`/$TEST_NAME
FROM_DIR=`pwd`/.libs
-PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*"
-PLUGIN_LIB2="$FROM_DIR/libdynlib2.*"
+case $(uname) in
+ CYGWIN* )
+ PLUGIN_LIB1="$FROM_DIR/cygdynlib1* $FROM_DIR/cygdynlib3*"
+ PLUGIN_LIB2="$FROM_DIR/cygdynlib2*"
+ ;;
+ *)
+ PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*"
+ PLUGIN_LIB2="$FROM_DIR/libdynlib2.*"
+ ::
+esac
PLUGIN_LIBDIR1=testdir1
PLUGIN_LIBDIR2=testdir2
CP="cp -p" # Use -p to preserve mode,ownership,timestamps
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 3dba919..ce29208 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -76,7 +76,7 @@ install (
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_TOOLS_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} toolslibraries)
+ INSTALL_TARGET_PDB (${HDF5_TOOLS_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} toolslibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index d163b8f..a824226 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -456,7 +456,7 @@
#define H5_PACKAGE_NAME "HDF5"
/* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.212"
+#define H5_PACKAGE_STRING "HDF5 1.9.213"
/* Define to the one symbol short name of this package. */
#define H5_PACKAGE_TARNAME "hdf5"
@@ -465,7 +465,7 @@
#define H5_PACKAGE_URL ""
/* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.212"
+#define H5_PACKAGE_VERSION "1.9.213"
/* Width for printf() for type `long long' or `__int64', use `ll' */
#define H5_PRINTF_LL_WIDTH "ll"
@@ -628,7 +628,7 @@
/* #undef H5_USING_MEMCHECKER */
/* Version number of package */
-#define H5_VERSION "1.9.212"
+#define H5_VERSION "1.9.213"
/* Define if vsnprintf() returns the correct value for formatted strings that
don't fit into size allowed */