diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-01-11 15:55:55 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-01-11 15:55:55 (GMT) |
| commit | 5dbc03ac86cb05730467eb0cad4bf3fb51a74ae4 (patch) | |
| tree | 85afdc8134a6e0b512c8ffeb3a63b6af4eb5409e /config | |
| parent | 2824e6bef0f9ea6550845f75ad4580349eafb822 (diff) | |
| parent | 887cf130ff773568f90ec8bae66dafa761a77712 (diff) | |
| download | hdf5-5dbc03ac86cb05730467eb0cad4bf3fb51a74ae4.zip hdf5-5dbc03ac86cb05730467eb0cad4bf3fb51a74ae4.tar.gz hdf5-5dbc03ac86cb05730467eb0cad4bf3fb51a74ae4.tar.bz2 | |
[svn-r28851] merge from trunk.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/cacheinit.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/libhdf5.settings.cmake.in | 1 | ||||
| -rw-r--r-- | config/cmake/mccacheinit.cmake | 2 | ||||
| -rw-r--r-- | config/lt_vers.am | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 4bef99f..5cae21b 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -36,6 +36,8 @@ set (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and set (HDF5_ENABLE_USING_MEMCHECKER OFF CACHE BOOL "Indicate that a memory checker is used" FORCE) +set (HDF5_MEMORY_ALLOC_SANITY_CHECK OFF CACHE BOOL "Indicate that internal memory allocation sanity checks are enabled" FORCE) + set (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE) set (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE) diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in index ba764a4..cc6ae3e 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -65,6 +65,7 @@ Features: dmalloc: @H5_HAVE_LIBDMALLOC@ Clear file buffers before write: @HDF5_Enable_Clear_File_Buffers@ Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@ +Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@ Function Stack Tracing: @HDF5_ENABLE_CODESTACK@ Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@ Optimization Instrumentation: @HDF5_Enable_Instrument@ diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake index 19ecc15..e54db1f 100644 --- a/config/cmake/mccacheinit.cmake +++ b/config/cmake/mccacheinit.cmake @@ -48,6 +48,8 @@ set (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and set (HDF5_ENABLE_USING_MEMCHECKER ON CACHE BOOL "Indicate that a memory checker is used" FORCE) +set (HDF5_MEMORY_ALLOC_SANITY_CHECK OFF CACHE BOOL "Indicate that internal memory allocation sanity checks are enabled" FORCE) + set (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE) set (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE) diff --git a/config/lt_vers.am b/config/lt_vers.am index 401bcb9..a3b7634 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 = 223 +LT_VERS_REVISION = 224 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and |