diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-07-06 19:16:07 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-07-06 19:16:07 (GMT) |
| commit | 046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8 (patch) | |
| tree | b932e36d4f7f428eed97a5e8b57137050f27ebb6 /tools/h5jam | |
| parent | 3fef275c89ef954eb44929ede39b3a3926d61292 (diff) | |
| download | hdf5-046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8.zip hdf5-046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8.tar.gz hdf5-046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8.tar.bz2 | |
[svn-r22522] Merge trunk revision 22520 cmake files and h5dump/h5diff and configure to branch
Diffstat (limited to 'tools/h5jam')
| -rw-r--r-- | tools/h5jam/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tools/h5jam/h5jam.c | 4 | ||||
| -rw-r--r-- | tools/h5jam/h5unjam.c | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt index a03d139..d0bf30f 100644 --- a/tools/h5jam/CMakeLists.txt +++ b/tools/h5jam/CMakeLists.txt @@ -534,11 +534,14 @@ ENDIF (BUILD_TESTING) #-----------------------------------------------------------------------------
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
+ +INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications) + INSTALL ( TARGETS h5jam h5unjam RUNTIME DESTINATION - ${HDF5_INSTALL_BIN_DIR}/tools + ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications ) diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index 981eead..52eb0aa 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -310,7 +310,7 @@ main (int argc, const char *argv[]) leave (EXIT_FAILURE); } - fsize = sbuf.st_size; + fsize = (off_t)sbuf.st_size; h5fid = HDopen(input_file, O_RDONLY, 0); if(h5fid < 0) { @@ -455,7 +455,7 @@ copy_some_to_file (int infid, int outfid, hsize_t startin, hsize_t startout, exit (EXIT_FAILURE); } - howmuch = sbuf.st_size; + howmuch = (ssize_t)sbuf.st_size; } else howmuch = limit; diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c index 4751dad..c304045 100644 --- a/tools/h5jam/h5unjam.c +++ b/tools/h5jam/h5unjam.c @@ -243,6 +243,9 @@ main(int argc, const char *argv[]) H5Eget_auto2(H5E_DEFAULT, &func, &edata); H5Eset_auto2(H5E_DEFAULT, NULL, NULL); + /* Initialize h5tools lib */ + h5tools_init(); + parse_command_line(argc, argv); if (input_file == NULL) { |