diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-15 13:33:49 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-15 13:33:49 (GMT) |
| commit | ef8c73ecc3e0a42885f8a6cde6a27d521658c1e2 (patch) | |
| tree | 9eee832db2498c6bc1fafe3c71cfe91b15e8eaf0 | |
| parent | 1177e649253e39aa5c8f76cb3374e412c542e415 (diff) | |
| download | hdf5-ef8c73ecc3e0a42885f8a6cde6a27d521658c1e2.zip hdf5-ef8c73ecc3e0a42885f8a6cde6a27d521658c1e2.tar.gz hdf5-ef8c73ecc3e0a42885f8a6cde6a27d521658c1e2.tar.bz2 | |
[svn-r27789] Merge of r27683-r27698 from the trunk.
Tested on: h5committest
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/H5public.h | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 58d31a8..d188529 100644 --- a/configure.ac +++ b/configure.ac @@ -1464,8 +1464,7 @@ AC_CACHE_SAVE AC_MSG_CHECKING([for thread safe support]) AC_ARG_ENABLE([threadsafe], [AS_HELP_STRING([--enable-threadsafe], - [Enable thread-safe capability. This will disable the high-level library. - You can override this behavior by specifying --enable-hl and --enable-unsupported. + [Enable thread-safe capability. Not compatible with the high-level library, Fortran, or C++ wrappers. [default=no]])], [THREADSAFE=$enableval]) @@ -1480,7 +1479,7 @@ AC_ARG_ENABLE([threadsafe], ## users will have to add --disable-hl to the configure options. if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then if test "X${HDF5_HL}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then - AC_MSG_ERROR([The thread-safe library is incompatible with the high-level library. --enable-unsupported will allow building the high-level library, though this configuration is not supported by The HDF Group. Alternatively,--disable-hl can be used to prevent building the high-level library (recommended).]) + AC_MSG_ERROR([The thread-safe library is incompatible with the high-level library. --disable-hl can be used to prevent building the high-level library (recommended). Alternatively, --enable-unsupported will allow building the high-level library, though this configuration is not supported by The HDF Group.]) fi fi 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) |