diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-01-26 15:48:40 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-01-26 15:48:40 (GMT) |
| commit | adc9b8b27a42094f2ef33bc2c7c187b321f69a52 (patch) | |
| tree | 9ea6541a1546a09eb062fa8163984102683657cb | |
| parent | dfaf51fda44621fa4c8136575fa6a2a26c9b08cc (diff) | |
| parent | ad906dc708fc803e8c5f17963fafa63591d3cc8d (diff) | |
| download | hdf5-adc9b8b27a42094f2ef33bc2c7c187b321f69a52.zip hdf5-adc9b8b27a42094f2ef33bc2c7c187b321f69a52.tar.gz hdf5-adc9b8b27a42094f2ef33bc2c7c187b321f69a52.tar.bz2 | |
Merge pull request #1499 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ad906dc708fc803e8c5f17963fafa63591d3cc8d':
Invalid position of declaration fixed.
Fix CMake on Windows
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 2 | ||||
| -rw-r--r-- | tools/src/h5repack/h5repack_filters.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 27d730b..b3d97ce 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -14,7 +14,7 @@ macro (SET_HDF_BUILD_TYPE) get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if(_isMultiConfig) - set(HDF_CFG_NAME ${CTEST_CONFIGURATION_TYPE}) + set(HDF_CFG_NAME \${CTEST_CONFIGURATION_TYPE}) set(HDF_BUILD_TYPE ${CMAKE_CFG_INTDIR}) set(HDF_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME}) else() diff --git a/tools/src/h5repack/h5repack_filters.c b/tools/src/h5repack/h5repack_filters.c index 123263c..3d9472a 100644 --- a/tools/src/h5repack/h5repack_filters.c +++ b/tools/src/h5repack/h5repack_filters.c @@ -338,9 +338,10 @@ int apply_filters(const char* name, /* object name from traverse list */ sm_nbytes = msize; for (i = rank; i > 0; --i) { + hsize_t size = 0; if(sm_nbytes == 0) HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "number of bytes per stripmine must be > 0"); - hsize_t size = H5TOOLS_BUFSIZE / sm_nbytes; + size = H5TOOLS_BUFSIZE / sm_nbytes; if (size == 0) /* datum size > H5TOOLS_BUFSIZE */ size = 1; sm_size[i - 1] = MIN(dims[i - 1], size); |