summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-09-15 13:33:49 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-09-15 13:33:49 (GMT)
commitef8c73ecc3e0a42885f8a6cde6a27d521658c1e2 (patch)
tree9eee832db2498c6bc1fafe3c71cfe91b15e8eaf0 /src
parent1177e649253e39aa5c8f76cb3374e412c542e415 (diff)
downloadhdf5-ef8c73ecc3e0a42885f8a6cde6a27d521658c1e2.zip
hdf5-ef8c73ecc3e0a42885f8a6cde6a27d521658c1e2.tar.gz
hdf5-ef8c73ecc3e0a42885f8a6cde6a27d521658c1e2.tar.bz2
[svn-r27789] Merge of r27683-r27698 from the trunk.
Tested on: h5committest
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/H5public.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ad8835c..2aa43f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -808,7 +808,7 @@ if (HDF5_GENERATE_HEADERS)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5Edefin.h ${CMAKE_CURRENT_BINARY_DIR}/H5Einit.h ${CMAKE_CURRENT_BINARY_DIR}/H5Epubgen.h ${CMAKE_CURRENT_BINARY_DIR}/H5Eterm.h
PRE_BUILD
COMMAND ${PERL_EXECUTABLE}
- ARGS ${HDF5_SOURCE_DIR}/bin/make_err.pl ${HDF5_SOURCE_DIR}/src/H5err.txt ${CMAKE_CURRENT_BINARY_DIR}
+ ARGS ${HDF5_SOURCE_DIR}/bin/make_err ${HDF5_SOURCE_DIR}/src/H5err.txt ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${HDF5_SOURCE_DIR}/src/H5err.txt
COMMENT " Creating err header"
)
@@ -817,7 +817,7 @@ if (HDF5_GENERATE_HEADERS)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5version.h
PRE_BUILD
COMMAND ${PERL_EXECUTABLE}
- ARGS ${HDF5_SOURCE_DIR}/bin/make_vers.pl ${HDF5_SOURCE_DIR}/src/H5vers.txt ${CMAKE_CURRENT_BINARY_DIR}
+ ARGS ${HDF5_SOURCE_DIR}/bin/make_vers ${HDF5_SOURCE_DIR}/src/H5vers.txt ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${HDF5_SOURCE_DIR}/src/H5vers.txt
COMMENT " Creating API version macro"
)
@@ -826,7 +826,7 @@ if (HDF5_GENERATE_HEADERS)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5overflow.h
PRE_BUILD
COMMAND ${PERL_EXECUTABLE}
- ARGS ${HDF5_SOURCE_DIR}/bin/make_overflow.pl ${HDF5_SOURCE_DIR}/src/H5overflow.txt ${CMAKE_CURRENT_BINARY_DIR}
+ ARGS ${HDF5_SOURCE_DIR}/bin/make_overflow ${HDF5_SOURCE_DIR}/src/H5overflow.txt ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${HDF5_SOURCE_DIR}/src/H5overflow.txt
COMMENT " Creating Assignment overflow macro"
)
diff --git a/src/H5public.h b/src/H5public.h
index 6d868de..816e50a 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 230 /* For tweaks, bug-fixes, or development */
+#define H5_VERS_RELEASE 231 /* 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.230" /* Full version string */
+#define H5_VERS_INFO "HDF5 library version: 1.9.231" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)